diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index f813577b..bc0bf18a 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -69,13 +69,12 @@ jobs: && cd ${{ runner.temp }}/camel-quarkus \ && echo "Current Camel Quarkus commit:" $(git rev-parse HEAD) \ && ./mvnw ${MAVEN_ARGS} clean install -Dquickly - - name: mvn license:check formatter:validate impsort:check cq:sync-example-properties + - name: mvn license:check formatter:validate impsort:check run: | ./mvnw-for-each.sh ${MAVEN_ARGS} \ license:check \ net.revelc.code.formatter:formatter-maven-plugin:validate \ - net.revelc.code:impsort-maven-plugin:check \ - org.l2x6.cq:cq-maven-plugin:0.33.0:sync-example-properties + net.revelc.code:impsort-maven-plugin:check - name: Validate test categories YAML run: | VALID=true diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml index 7c54dc76..d67f260b 100644 --- a/aws-lambda/pom.xml +++ b/aws-lambda/pom.xml @@ -27,8 +27,13 @@ Camel Quarkus Example :: Deploying a Camel Route in AWS Lambda - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -49,9 +54,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -146,9 +158,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} true @@ -207,7 +219,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin true diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml index 216578b7..adbaf1c4 100644 --- a/file-bindy-ftp/pom.xml +++ b/file-bindy-ftp/pom.xml @@ -28,8 +28,13 @@ Camel Quarkus Example :: File Bindy FTP - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -51,9 +56,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -167,9 +179,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -216,7 +228,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/file-split-log-xml/pom.xml b/file-split-log-xml/pom.xml index 2a82cdc3..9e341cc9 100644 --- a/file-split-log-xml/pom.xml +++ b/file-split-log-xml/pom.xml @@ -28,8 +28,13 @@ Camel Quarkus Example :: File To Log XML DSL - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -51,9 +56,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -146,9 +158,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -196,7 +208,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/health/pom.xml b/health/pom.xml index 26dadbaa..4261b2dc 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -28,8 +28,13 @@ Camel Quarkus Example :: Health Check - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -51,9 +56,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -145,9 +157,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -194,7 +206,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/http-log/pom.xml b/http-log/pom.xml index ec01f137..9367bf00 100644 --- a/http-log/pom.xml +++ b/http-log/pom.xml @@ -28,8 +28,13 @@ Camel Quarkus Example :: HTTP to Log - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -51,9 +56,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -150,9 +162,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -199,7 +211,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/jdbc-datasource/pom.xml b/jdbc-datasource/pom.xml index 80f5d461..1e967fc0 100644 --- a/jdbc-datasource/pom.xml +++ b/jdbc-datasource/pom.xml @@ -25,7 +25,14 @@ Camel Quarkus :: Examples :: Jdbc - DatataSource - Log Camel Quarkus Example :: Connect to Database using Datasource - 2.2.0 + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom + 2.11.0 1.3.2 3.8.0 @@ -39,21 +46,20 @@ 3.0 UTF-8 UTF-8 - 2.2.0.Final - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} pom import - org.apache.camel.quarkus - camel-quarkus-bom-test - ${camel-quarkus.version} + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -148,9 +154,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} maven-failsafe-plugin @@ -192,7 +198,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/kafka/README.adoc b/kafka/README.adoc index 51b2034a..9476221c 100644 --- a/kafka/README.adoc +++ b/kafka/README.adoc @@ -9,9 +9,13 @@ and other general information. == Prerequisites -The example application requires a running Kafka instance. +The example application requires a Kafka instance. -For simplicity, this example uses Quarkus DevServices in dev mode. It will automatically start Strimzi container for your tests, and you don’t even need to configure anything: the container will be automatically wired to the Quarkus dev mode configuration. +You do not need to provide the Kafka instance yourself +as long as you play with the example code in dev mode (a.k.a. `mvn quarkus:dev` - read more [here](https://quarkus.io/guides/getting-started#development-mode)) +or as long as you only run the supplied tests (`mvn test`). +In those situations, Quarkus tooling starts a Redpanda image for you via [Quarkus Dev Services](https://quarkus.io/guides/kafka-dev-services) +and it also configures the application so that you do not need touch anything in `application.properties`. == Start in Development mode diff --git a/kafka/pom.xml b/kafka/pom.xml index 7b242373..d2de3a02 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -28,8 +28,13 @@ Camel Quarkus Example :: Kafka - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -52,9 +57,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -176,9 +188,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -226,7 +238,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/kafka/src/main/resources/application.properties b/kafka/src/main/resources/application.properties index 33fefb99..670b6bf3 100644 --- a/kafka/src/main/resources/application.properties +++ b/kafka/src/main/resources/application.properties @@ -23,8 +23,7 @@ timer.period = 10000 timer.delay = 10000 # Kafka instance without Authentication -# Passing ${kafka.bootstrap.servers} is a workaround for https://github.com/apache/camel-quarkus/issues/2939 -camel.component.kafka.brokers=${brokers:${kafka.bootstrap.servers}} +#camel.component.kafka.brokers=${brokers} # uncomment to set Kafka instance with SASL Plain #camel.component.kafka.brokers=${brokers} diff --git a/kafka/src/test/java/org/apache/camel/example/KafkaIT.java b/kafka/src/test/java/org/apache/camel/example/KafkaIT.java index 857c965d..0eb99ef7 100644 --- a/kafka/src/test/java/org/apache/camel/example/KafkaIT.java +++ b/kafka/src/test/java/org/apache/camel/example/KafkaIT.java @@ -17,7 +17,9 @@ package org.apache.camel.example; import io.quarkus.test.junit.NativeImageTest; +import org.junit.jupiter.api.Disabled; +@Disabled("https://github.com/apache/camel-quarkus/issues/3157") @NativeImageTest public class KafkaIT extends KafkaTest { } diff --git a/kamelet-chucknorris/pom.xml b/kamelet-chucknorris/pom.xml index ca4c9a4f..053d023a 100644 --- a/kamelet-chucknorris/pom.xml +++ b/kamelet-chucknorris/pom.xml @@ -28,8 +28,16 @@ Camel Quarkus Example :: Kamelet Chuck Norris - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -53,16 +61,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} pom import - org.apache.camel.quarkus - camel-quarkus-bom-test - ${camel-quarkus.version} + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -114,6 +122,7 @@ org.apache.camel.quarkus camel-quarkus-integration-tests-process-executor-support + ${camel-quarkus.version} test @@ -180,9 +189,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -229,7 +238,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/observability/pom.xml b/observability/pom.xml index 85b8fe82..77bf2c4e 100644 --- a/observability/pom.xml +++ b/observability/pom.xml @@ -28,8 +28,14 @@ Camel Quarkus Example :: Observability - 2.2.0 - 2.2.0.Final + + 2.3.0.Final + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom + 2.3.0 UTF-8 UTF-8 @@ -51,9 +57,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -150,9 +163,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -199,7 +212,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/rest-json/pom.xml b/rest-json/pom.xml index f0b05104..e3a31ab2 100644 --- a/rest-json/pom.xml +++ b/rest-json/pom.xml @@ -28,8 +28,13 @@ Camel Quarkus Example :: Rest Json - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -51,9 +56,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -134,9 +146,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -183,7 +195,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin @@ -287,9 +299,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} diff --git a/timer-log-cdi/pom.xml b/timer-log-cdi/pom.xml index 35da5eb5..0669eb89 100644 --- a/timer-log-cdi/pom.xml +++ b/timer-log-cdi/pom.xml @@ -28,8 +28,13 @@ Camel Quarkus Example :: Timer to Log CDI - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -51,9 +56,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -138,9 +150,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -187,7 +199,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/timer-log-kotlin/pom.xml b/timer-log-kotlin/pom.xml index 7a5bc843..2516c9e1 100644 --- a/timer-log-kotlin/pom.xml +++ b/timer-log-kotlin/pom.xml @@ -28,8 +28,13 @@ Camel Quarkus Example :: Timer to Log Kotlin - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom 1.5.21 UTF-8 @@ -52,9 +57,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -146,9 +158,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -195,7 +207,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/timer-log-main/pom.xml b/timer-log-main/pom.xml index 5bacae14..d1d938e4 100644 --- a/timer-log-main/pom.xml +++ b/timer-log-main/pom.xml @@ -28,8 +28,16 @@ Camel Quarkus Example :: Timer to Log Main - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -53,9 +61,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -97,6 +112,7 @@ org.apache.camel.quarkus camel-quarkus-integration-tests-process-executor-support + ${camel-quarkus.version} test @@ -168,9 +184,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -217,7 +233,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/timer-log-spring/pom.xml b/timer-log-spring/pom.xml index 0875ce0a..ed1dc9c5 100644 --- a/timer-log-spring/pom.xml +++ b/timer-log-spring/pom.xml @@ -28,8 +28,13 @@ Camel Quarkus Example :: Timer to Log Spring - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -51,9 +56,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -142,9 +154,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -191,7 +203,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/timer-log-xml/pom.xml b/timer-log-xml/pom.xml index cd85a962..76c765f9 100644 --- a/timer-log-xml/pom.xml +++ b/timer-log-xml/pom.xml @@ -28,8 +28,13 @@ Camel Quarkus Example :: Timer to Log XML - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -51,9 +56,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -142,9 +154,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -191,7 +203,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin diff --git a/timer-log/pom.xml b/timer-log/pom.xml index e58ce87b..e904fbc0 100644 --- a/timer-log/pom.xml +++ b/timer-log/pom.xml @@ -28,8 +28,13 @@ Camel Quarkus Example :: Timer to Log - 2.2.0 - 2.2.0.Final + 2.3.0.Final + 2.3.0 + + io.quarkus + quarkus-bom + org.apache.camel.quarkus + camel-quarkus-bom UTF-8 UTF-8 @@ -51,9 +56,16 @@ - org.apache.camel.quarkus - camel-quarkus-bom - ${camel-quarkus.version} + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} + ${quarkus.platform.version} + pom + import + + + ${camel-quarkus.platform.group-id} + ${camel-quarkus.platform.artifact-id} + ${camel-quarkus.platform.version} pom import @@ -138,9 +150,9 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin - ${quarkus.version} + ${quarkus.platform.version} @@ -187,7 +199,7 @@ - io.quarkus + ${quarkus.platform.group-id} quarkus-maven-plugin