From e91c528449b1bf26c51cebc9784bb11a9861a46c Mon Sep 17 00:00:00 2001 From: Luca Burgazzoli Date: Fri, 25 Sep 2020 07:59:03 +0200 Subject: [PATCH] chore(build): add virtual deps to quarkus itests to ensure test have correct dependency tree on deployment artifacts --- .../camel-k-quarkus-itests-core/pom.xml | 15 ++++++ .../camel-k-quarkus-itests-cron/pom.xml | 47 ++++++++++++++++- .../camel-k-quarkus-itests-kamelet/pom.xml | 41 +++++++++++++++ .../camel-k-quarkus-itests-knative/pom.xml | 43 ++++++++++++++++ .../pom.xml | 25 +++++++-- .../pom.xml | 25 +++++++-- .../camel-k-quarkus-itests-loader-js/pom.xml | 25 +++++++-- .../pom.xml | 25 +++++++-- .../camel-k-quarkus-itests-loader-xml/pom.xml | 25 +++++++-- .../pom.xml | 25 +++++++-- .../camel-k-quarkus-itests-master/pom.xml | 28 ++++++++++ .../camel-k-quarkus-itests-polyglot/pom.xml | 51 +++++++++++++++++-- .../camel-k-quarkus-itests-runtime/pom.xml | 15 ++++++ .../camel-k-quarkus-itests-wrap/pom.xml | 43 ++++++++++++++++ 14 files changed, 403 insertions(+), 30 deletions(-) diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/pom.xml index 314b47e39..da29b9e44 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/pom.xml @@ -62,6 +62,21 @@ assertj-core test + + + + org.apache.camel.k + camel-k-quarkus-core-deployment + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/pom.xml index 032eb98c7..85665509e 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/pom.xml @@ -34,12 +34,14 @@ org.apache.camel.k - camel-k-quarkus-cron + camel-k-quarkus-loader-yaml org.apache.camel.k - camel-k-quarkus-loader-yaml + camel-k-quarkus-cron + + org.apache.camel.quarkus camel-quarkus-timer @@ -87,6 +89,47 @@ ${awaitility-version} + + + org.apache.camel.k + camel-k-runtime-quarkus-deployment + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.k + camel-k-quarkus-loader-yaml-deployment + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.k + camel-k-quarkus-cron-deployment + ${project.version} + pom + test + + + * + * + + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml index 1681d65d2..43cc0ec8b 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml @@ -70,6 +70,47 @@ assertj-core test + + + + org.apache.camel.k + camel-k-runtime-quarkus-deployment + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.k + camel-k-quarkus-kamelet-deployment + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.k + camel-k-quarkus-loader-yaml-deployment + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/pom.xml index 80857c28e..6b51e2747 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/pom.xml @@ -40,6 +40,8 @@ org.apache.camel.k camel-k-quarkus-loader-yaml + + org.apache.camel.quarkus camel-quarkus-direct @@ -74,6 +76,47 @@ assertj-core test + + + + org.apache.camel.k + camel-k-runtime-quarkus + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.k + camel-k-quarkus-knative + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.k + camel-k-quarkus-loader-yaml + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-groovy/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-groovy/pom.xml index ca032d569..37952237d 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-groovy/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-groovy/pom.xml @@ -32,6 +32,12 @@ org.apache.camel.k camel-k-quarkus-loader-groovy + + org.apache.camel.k + camel-k-quarkus-itests-loader-support + + + org.apache.camel.quarkus camel-quarkus-direct @@ -40,10 +46,6 @@ org.apache.camel.quarkus camel-quarkus-log - - org.apache.camel.k - camel-k-quarkus-itests-loader-support - @@ -61,6 +63,21 @@ assertj-core test + + + + org.apache.camel.k + camel-k-quarkus-loader-groovy-deployment + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-java/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-java/pom.xml index b0fcae3dd..f77786be0 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-java/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-java/pom.xml @@ -32,6 +32,12 @@ org.apache.camel.k camel-k-quarkus-loader-java + + org.apache.camel.k + camel-k-quarkus-itests-loader-support + + + org.apache.camel.quarkus camel-quarkus-direct @@ -40,10 +46,6 @@ org.apache.camel.quarkus camel-quarkus-log - - org.apache.camel.k - camel-k-quarkus-itests-loader-support - @@ -61,6 +63,21 @@ assertj-core test + + + + org.apache.camel.k + camel-k-quarkus-loader-java-deployment + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/pom.xml index 290662527..846a450a6 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/pom.xml @@ -32,6 +32,12 @@ org.apache.camel.k camel-k-quarkus-loader-js + + org.apache.camel.k + camel-k-quarkus-itests-loader-support + + + org.apache.camel.quarkus camel-quarkus-direct @@ -40,10 +46,6 @@ org.apache.camel.quarkus camel-quarkus-log - - org.apache.camel.k - camel-k-quarkus-itests-loader-support - @@ -61,6 +63,21 @@ assertj-core test + + + + org.apache.camel.k + camel-k-quarkus-loader-js-deployment + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-kotlin/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-kotlin/pom.xml index 9f86e649f..01edc421e 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-kotlin/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-kotlin/pom.xml @@ -32,6 +32,12 @@ org.apache.camel.k camel-k-quarkus-loader-kotlin + + org.apache.camel.k + camel-k-quarkus-itests-loader-support + + + org.apache.camel.quarkus camel-quarkus-direct @@ -40,10 +46,6 @@ org.apache.camel.quarkus camel-quarkus-log - - org.apache.camel.k - camel-k-quarkus-itests-loader-support - @@ -61,6 +63,21 @@ assertj-core test + + + + org.apache.camel.k + camel-k-quarkus-loader-kotlin-deployment + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/pom.xml index 8b1c2d7c4..e616f4a4e 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/pom.xml @@ -32,6 +32,12 @@ org.apache.camel.k camel-k-quarkus-loader-xml + + org.apache.camel.k + camel-k-quarkus-itests-loader-support + + + org.apache.camel.quarkus camel-quarkus-direct @@ -40,10 +46,6 @@ org.apache.camel.quarkus camel-quarkus-log - - org.apache.camel.k - camel-k-quarkus-itests-loader-support - @@ -61,6 +63,21 @@ assertj-core test + + + + org.apache.camel.k + camel-k-quarkus-loader-xml-deployment + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/pom.xml index a09bf7aee..75dea7bb0 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/pom.xml @@ -32,6 +32,12 @@ org.apache.camel.k camel-k-quarkus-loader-yaml + + org.apache.camel.k + camel-k-quarkus-itests-loader-support + + + org.apache.camel.quarkus camel-quarkus-direct @@ -40,10 +46,6 @@ org.apache.camel.quarkus camel-quarkus-log - - org.apache.camel.k - camel-k-quarkus-itests-loader-support - @@ -61,6 +63,21 @@ assertj-core test + + + + org.apache.camel.k + camel-k-quarkus-loader-yaml-deployment + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/pom.xml index 2d783cfd6..1288f2c33 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/pom.xml @@ -72,6 +72,34 @@ hamcrest-core test + + + + org.apache.camel.k + camel-k-runtime-quarkus-deployment + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.k + camel-k-quarkus-master-deployment + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-polyglot/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-polyglot/pom.xml index 2c6f33952..e8648fcc2 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-polyglot/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-polyglot/pom.xml @@ -36,6 +36,12 @@ org.apache.camel.k camel-k-quarkus-loader-xml + + org.apache.camel.k + camel-k-quarkus-itests-loader-support + + + org.apache.camel.quarkus camel-quarkus-direct @@ -48,10 +54,6 @@ org.apache.camel.quarkus camel-quarkus-jackson - - org.apache.camel.k - camel-k-quarkus-itests-loader-support - @@ -69,6 +71,47 @@ assertj-core test + + + + org.apache.camel.k + camel-k-runtime-quarkus-deployment + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.k + camel-k-quarkus-loader-yaml-deployment + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.k + camel-k-quarkus-loader-xml-deployment + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime/pom.xml index 90f33260f..a8579606e 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-runtime/pom.xml @@ -62,6 +62,21 @@ assertj-core test + + + + org.apache.camel.k + camel-k-runtime-quarkus-deployment + ${project.version} + pom + test + + + * + * + + + diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-wrap/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-wrap/pom.xml index 27ccd385c..6d50e2b9d 100644 --- a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-wrap/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-wrap/pom.xml @@ -40,6 +40,8 @@ org.apache.camel.k camel-k-quarkus-loader-yaml + + org.apache.camel.quarkus camel-quarkus-activemq @@ -102,6 +104,47 @@ test + + + org.apache.camel.k + camel-k-runtime-quarkus-deployment + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.k + camel-k-quarkus-wrap-deployment + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.k + camel-k-quarkus-loader-yaml-deployment + ${project.version} + pom + test + + + * + * + + + +