Skip to content

Commit

Permalink
chore(build): add virtual deps to quarkus itests to ensure test have …
Browse files Browse the repository at this point in the history 
…correct dependency tree on deployment artifacts
  • Loading branch information
@lburgazzoli
lburgazzoli committed Sep 25, 2020
1 parent cd744fa commit e91c528
Show file tree
Hide file tree
Showing 14 changed files with 403 additions and 30 deletions.
15 changes: 15 additions & 0 deletions camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,21 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

<!-- The following dependencies guarantee that this module is built after them. -->
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-core-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>


Expand Down
47 changes: 45 additions & 2 deletions camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-cron</artifactId>
<artifactId>camel-k-quarkus-loader-yaml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-yaml</artifactId>
<artifactId>camel-k-quarkus-cron</artifactId>
</dependency>

<!-- camel quarkus -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-timer</artifactId>
Expand Down Expand Up @@ -87,6 +89,47 @@
<version>${awaitility-version}</version>
</dependency>

<!-- The following dependencies guarantee that this module is built after them. -->
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-quarkus-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-yaml-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-cron-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>


Expand Down
41 changes: 41 additions & 0 deletions camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-kamelet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,47 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

<!-- The following dependencies guarantee that this module is built after them. -->
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-quarkus-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-kamelet-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-yaml-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>


Expand Down
43 changes: 43 additions & 0 deletions camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-yaml</artifactId>
</dependency>

<!-- camel quarkus -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-direct</artifactId>
Expand Down Expand Up @@ -74,6 +76,47 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

<!-- The following dependencies guarantee that this module is built after them. -->
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-quarkus</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-knative</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-yaml</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
Expand Down
25 changes: 21 additions & 4 deletions camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-groovy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-groovy</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-itests-loader-support</artifactId>
</dependency>

<!-- camel quarkus -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-direct</artifactId>
Expand All @@ -40,10 +46,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-log</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-itests-loader-support</artifactId>
</dependency>

<!-- test dependencies -->
<dependency>
Expand All @@ -61,6 +63,21 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

<!-- The following dependencies guarantee that this module is built after them. -->
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-groovy-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
Expand Down
25 changes: 21 additions & 4 deletions camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-itests-loader-support</artifactId>
</dependency>

<!-- camel quarkus -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-direct</artifactId>
Expand All @@ -40,10 +46,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-log</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-itests-loader-support</artifactId>
</dependency>

<!-- test dependencies -->
<dependency>
Expand All @@ -61,6 +63,21 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

<!-- The following dependencies guarantee that this module is built after them. -->
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-java-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
Expand Down
25 changes: 21 additions & 4 deletions camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-js</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-itests-loader-support</artifactId>
</dependency>

<!-- camel quarkus -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-direct</artifactId>
Expand All @@ -40,10 +46,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-log</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-itests-loader-support</artifactId>
</dependency>

<!-- test dependencies -->
<dependency>
Expand All @@ -61,6 +63,21 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

<!-- The following dependencies guarantee that this module is built after them. -->
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-js-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>


Expand Down
25 changes: 21 additions & 4 deletions camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-kotlin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-kotlin</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-itests-loader-support</artifactId>
</dependency>

<!-- camel quarkus -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-direct</artifactId>
Expand All @@ -40,10 +46,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-log</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-itests-loader-support</artifactId>
</dependency>

<!-- test dependencies -->
<dependency>
Expand All @@ -61,6 +63,21 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

<!-- The following dependencies guarantee that this module is built after them. -->
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-kotlin-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
Expand Down
Loading

0 comments on commit e91c528

Please sign in to comment.