Skip to content

Commit

Permalink
Make integration tests runnable against Quarkus Platform BOM apache#3123
Browse files Browse the repository at this point in the history
  • Loading branch information
ppalaga committed Sep 29, 2021
1 parent 71c6b3f commit cddde6e
Show file tree
Hide file tree
Showing 874 changed files with 5,614 additions and 1,447 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,9 @@ jobs:
echo "HOSTS_LINE=$HOSTS_LINE"
echo "${HOSTS_LINE}" | sudo tee -a /etc/hosts
cat /etc/hosts
- name: cd extensions-jvm && mvn clean test
- name: cd integration-tests-jvm && mvn clean test
run: |
cd extensions-jvm
cd integration-tests-jvm
../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
--fail-at-end \
Expand Down
12 changes: 12 additions & 0 deletions catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,18 @@
<artifactId>camel-quarkus-catalog</artifactId>
<name>Camel Quarkus :: Catalog</name>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-bom</artifactId>
<version>${camel-quarkus.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions extensions-core/caffeine-lrucache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-core</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions extensions-core/core-cloud/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-core</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-core-cloud-parent</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions extensions-core/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-core</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions extensions-core/http-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-core</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-http-common-parent</artifactId>
Expand Down
15 changes: 14 additions & 1 deletion extensions-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus</artifactId>
<artifactId>camel-quarkus-build-parent</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../poms/build-parent/pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-extensions-core</artifactId>
Expand All @@ -44,4 +45,16 @@
<module>yaml-dsl</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-bom</artifactId>
<version>${camel-quarkus.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

</project>
4 changes: 2 additions & 2 deletions extensions-core/reactive-executor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-core</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions extensions-core/threadpoolfactory-vertx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-core</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-threadpoolfactory-vertx-parent</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions extensions-core/xml-io-dsl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-core</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-xml-io-dsl-parent</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions extensions-core/xml-jaxb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-core</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-xml-jaxb-parent</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions extensions-core/xml-jaxp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-core</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-xml-jaxp-parent</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions extensions-core/yaml-dsl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-core</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-yaml-dsl-parent</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions extensions-jvm/asn1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-jvm</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-asn1-parent</artifactId>
Expand All @@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-test</module>
</modules>
</project>
5 changes: 2 additions & 3 deletions extensions-jvm/asterisk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-jvm</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-asterisk-parent</artifactId>
Expand All @@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-test</module>
</modules>
</project>
5 changes: 2 additions & 3 deletions extensions-jvm/atmos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-jvm</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-atmos-parent</artifactId>
Expand All @@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-test</module>
</modules>
</project>
5 changes: 2 additions & 3 deletions extensions-jvm/atomix/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-jvm</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-atomix-parent</artifactId>
Expand All @@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-test</module>
</modules>
</project>
5 changes: 2 additions & 3 deletions extensions-jvm/aws-secrets-manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-jvm</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-aws-secrets-manager-parent</artifactId>
Expand All @@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-test</module>
</modules>
</project>
5 changes: 2 additions & 3 deletions extensions-jvm/aws-xray/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-jvm</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-aws-xray-parent</artifactId>
Expand All @@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-test</module>
</modules>
</project>
5 changes: 2 additions & 3 deletions extensions-jvm/azure-cosmosdb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-jvm</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-azure-cosmosdb-parent</artifactId>
Expand All @@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-test</module>
</modules>
</project>
5 changes: 2 additions & 3 deletions extensions-jvm/azure-storage-datalake/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-jvm</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-azure-storage-datalake-parent</artifactId>
Expand All @@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-test</module>
</modules>
</project>
5 changes: 2 additions & 3 deletions extensions-jvm/barcode/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-jvm</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-barcode-parent</artifactId>
Expand All @@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-test</module>
</modules>
</project>
5 changes: 2 additions & 3 deletions extensions-jvm/beanio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-jvm</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-beanio-parent</artifactId>
Expand All @@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-test</module>
</modules>
</project>
5 changes: 2 additions & 3 deletions extensions-jvm/beanstalk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<artifactId>camel-quarkus-extensions-jvm</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-beanstalk-parent</artifactId>
Expand All @@ -33,6 +33,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
<module>integration-test</module>
</modules>
</project>
Loading

0 comments on commit cddde6e

Please sign in to comment.