This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 63d6637cfeb7998c4cb6576471da3d08dfe8a57a Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Fri May 29 18:55:46 2020 +0200 chore(build): reorganize quarkus integration tests --- .github/workflows/pr-build.yml | 72 +++++++++++----------- camel-k-quarkus/camel-k-quarkus-core/pom.xml | 1 - camel-k-quarkus/camel-k-quarkus-cron/pom.xml | 1 - .../camel-k-quarkus-itests-core}/pom.xml | 4 +- .../k/core/quarkus/deployment/Application.java | 0 .../src/main/resources/application.properties | 0 .../k/core/quarkus/deployment/ExtensionIT.java | 0 .../k/core/quarkus/deployment/ExtensionTest.java | 0 .../camel-k-quarkus-itests-cron}/pom.xml | 4 +- .../k/quarkus/cron/deployment/Application.java | 0 .../src/main/resources/application.properties | 0 .../k/quarkus/cron/deployment/ExtensionIT.java | 0 .../k/quarkus/cron/deployment/ExtensionTest.java | 0 .../camel-k-quarkus-itests-knative}/pom.xml | 4 +- .../k/quarkus/knative/deployment/Application.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/env.json | 0 .../k/quarkus/knative/deployment/ExtensionIT.java | 0 .../quarkus/knative/deployment/ExtensionTest.java | 0 .../camel-k-quarkus-itests-loader-js}/pom.xml | 4 +- .../loader/js/quarkus/deployment/Application.java | 0 .../src/main/resources/application.properties | 0 .../loader/js/quarkus/deployment/ExtensionIT.java | 0 .../js/quarkus/deployment/ExtensionTest.java | 0 .../src/test/resources/routes.js | 0 .../camel-k-quarkus-itests-loader-xml}/pom.xml | 4 +- .../loader/xml/quarkus/deployment/Application.java | 0 .../src/main/resources/application.properties | 0 .../loader/xml/quarkus/deployment/ExtensionIT.java | 0 .../xml/quarkus/deployment/ExtensionTest.java | 0 .../src/test/resources/routes.xml | 0 .../camel-k-quarkus-itests-loader-yaml}/pom.xml | 4 +- .../yaml/quarkus/deployment/Application.java | 0 .../src/main/resources/application.properties | 0 .../yaml/quarkus/deployment/ExtensionIT.java | 0 .../yaml/quarkus/deployment/ExtensionTest.java | 0 .../src/test/resources/routes.yaml | 0 .../pom.xml | 11 ++-- camel-k-quarkus/camel-k-quarkus-knative/pom.xml | 1 - camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml | 1 - camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml | 1 - .../camel-k-quarkus-loader-yaml/pom.xml | 1 - camel-k-quarkus/pom.xml | 2 + 43 files changed, 56 insertions(+), 59 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index feb48e2..caff4b4 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -53,18 +53,46 @@ jobs: - name: Build on ${{ matrix.java }} run: | ./mvnw -V -B -ntp clean install - build-native: + build-native-itests: + runs-on: ubuntu-latest + needs: build + strategy: + fail-fast: false + matrix: + native-image-project: + - :camel-k-quarkus-itests-core + - :camel-k-quarkus-itests-cron + - :camel-k-quarkus-itests-knative + - :camel-k-quarkus-itests-loader-xml + - :camel-k-quarkus-itests-loader-yaml + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: joschi/setup-jdk@v1 + with: + java-version: 11 + - name: Restore Cache + uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: maven-${{ github.run_id }}-${{ github.run_number }} + restore-keys: | + maven-${{ github.run_id }}-${{ github.run_number }} + - name: Integration Test - ${{ matrix.native-image-project }} + run: | + ./mvnw -V -B -ntp -nsu clean install \ + -Dnative \ + -Dnative-image.xmx=6g \ + -Ddocker \ + -pl ${{ matrix.native-image-project }} + build-native-examples: runs-on: ubuntu-latest needs: build strategy: fail-fast: false matrix: native-image-project: - - :camel-k-quarkus-core-it - - :camel-k-quarkus-cron-it - - :camel-k-quarkus-knative-it - - :camel-k-quarkus-loader-xml-it - - :camel-k-quarkus-loader-yaml-it - :camel-k-runtime-example-quarkus-xml - :camel-k-runtime-example-quarkus-yaml - :camel-k-runtime-example-quarkus-knative @@ -89,39 +117,9 @@ jobs: -Dnative-image.xmx=6g \ -Ddocker \ -pl ${{ matrix.native-image-project }} + # # JS build disabled as fails for OOM # relates to: https://github.com/oracle/graal/issues/2129 # -# build-native-js: -# runs-on: ubuntu-latest -# needs: build -# strategy: -# fail-fast: false -# matrix: -# native-image-project: -# - :camel-k-quarkus-loader-js-it -# - :camel-k-runtime-example-quarkus-js -# steps: -# - name: Checkout -# uses: actions/checkout@v2 -# - name: Set up JDK 8 -# uses: joschi/setup-jdk@v1 -# with: -# java-version: 11 -# - name: Restore Cache -# uses: actions/cache@v1 -# with: -# path: ~/.m2/repository -# key: maven-${{ github.run_id }}-${{ github.run_number }} -# restore-keys: | -# maven-${{ github.run_id }}-${{ github.run_number }} -# - name: Examples - ${{ matrix.native-image-project }} -# run: | -# ./mvnw -V -B -ntp -nsu clean package \ -# -Dnative \ -# -Dnative-image.xmx=6g \ -# -Ddocker \ -# -DskipTests \ -# -pl ${{ matrix.native-image-project }} diff --git a/camel-k-quarkus/camel-k-quarkus-core/pom.xml b/camel-k-quarkus/camel-k-quarkus-core/pom.xml index 4aa53bb..b3d3c0a 100644 --- a/camel-k-quarkus/camel-k-quarkus-core/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-core/pom.xml @@ -31,7 +31,6 @@ <modules> <module>runtime</module> <module>deployment</module> - <module>it</module> </modules> </project> diff --git a/camel-k-quarkus/camel-k-quarkus-cron/pom.xml b/camel-k-quarkus/camel-k-quarkus-cron/pom.xml index 9ae1a12..f95a57b 100644 --- a/camel-k-quarkus/camel-k-quarkus-cron/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-cron/pom.xml @@ -31,7 +31,6 @@ <modules> <module>runtime</module> <module>deployment</module> - <module>it</module> </modules> </project> diff --git a/camel-k-quarkus/camel-k-quarkus-core/it/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/pom.xml similarity index 98% rename from camel-k-quarkus/camel-k-quarkus-core/it/pom.xml rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/pom.xml index 2ddb15d..dbc752c 100644 --- a/camel-k-quarkus/camel-k-quarkus-core/it/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/pom.xml @@ -20,12 +20,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-quarkus-core-parent</artifactId> + <artifactId>camel-k-quarkus-itests</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-k-quarkus-core-it</artifactId> + <artifactId>camel-k-quarkus-itests-core</artifactId> <dependencies> <dependency> diff --git a/camel-k-quarkus/camel-k-quarkus-core/it/src/main/java/org/apache/camel/k/core/quarkus/deployment/Application.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/src/main/java/org/apache/camel/k/core/quarkus/deployment/Application.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-core/it/src/main/java/org/apache/camel/k/core/quarkus/deployment/Application.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/src/main/java/org/apache/camel/k/core/quarkus/deployment/Application.java diff --git a/camel-k-quarkus/camel-k-quarkus-core/it/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/src/main/resources/application.properties similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-core/it/src/main/resources/application.properties rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/src/main/resources/application.properties diff --git a/camel-k-quarkus/camel-k-quarkus-core/it/src/test/java/org/apache/camel/k/core/quarkus/deployment/ExtensionIT.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/ExtensionIT.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-core/it/src/test/java/org/apache/camel/k/core/quarkus/deployment/ExtensionIT.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/ExtensionIT.java diff --git a/camel-k-quarkus/camel-k-quarkus-core/it/src/test/java/org/apache/camel/k/core/quarkus/deployment/ExtensionTest.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/ExtensionTest.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-core/it/src/test/java/org/apache/camel/k/core/quarkus/deployment/ExtensionTest.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/ExtensionTest.java diff --git a/camel-k-quarkus/camel-k-quarkus-cron/it/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/pom.xml similarity index 98% rename from camel-k-quarkus/camel-k-quarkus-cron/it/pom.xml rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/pom.xml index 7724032..ee1649f 100644 --- a/camel-k-quarkus/camel-k-quarkus-cron/it/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/pom.xml @@ -20,12 +20,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-quarkus-cron-parent</artifactId> + <artifactId>camel-k-quarkus-itests</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-k-quarkus-cron-it</artifactId> + <artifactId>camel-k-quarkus-itests-cron</artifactId> <dependencies> <dependency> diff --git a/camel-k-quarkus/camel-k-quarkus-cron/it/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Application.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Application.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-cron/it/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Application.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Application.java diff --git a/camel-k-quarkus/camel-k-quarkus-cron/it/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/src/main/resources/application.properties similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-cron/it/src/main/resources/application.properties rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/src/main/resources/application.properties diff --git a/camel-k-quarkus/camel-k-quarkus-cron/it/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionIT.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionIT.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-cron/it/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionIT.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionIT.java diff --git a/camel-k-quarkus/camel-k-quarkus-cron/it/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionTest.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionTest.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-cron/it/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionTest.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-cron/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionTest.java diff --git a/camel-k-quarkus/camel-k-quarkus-knative/it/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/pom.xml similarity index 98% rename from camel-k-quarkus/camel-k-quarkus-knative/it/pom.xml rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/pom.xml index b90339c..92b3d29 100644 --- a/camel-k-quarkus/camel-k-quarkus-knative/it/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/pom.xml @@ -20,12 +20,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-quarkus-knative-parent</artifactId> + <artifactId>camel-k-quarkus-itests</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-k-quarkus-knative-it</artifactId> + <artifactId>camel-k-quarkus-itests-knative</artifactId> <dependencies> <dependency> diff --git a/camel-k-quarkus/camel-k-quarkus-knative/it/src/main/java/org/apache/camel/k/quarkus/knative/deployment/Application.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/src/main/java/org/apache/camel/k/quarkus/knative/deployment/Application.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-knative/it/src/main/java/org/apache/camel/k/quarkus/knative/deployment/Application.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/src/main/java/org/apache/camel/k/quarkus/knative/deployment/Application.java diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/src/main/resources/application.properties similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/main/resources/application.properties rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/src/main/resources/application.properties diff --git a/camel-k-quarkus/camel-k-quarkus-knative/it/src/main/resources/env.json b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/src/main/resources/env.json similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-knative/it/src/main/resources/env.json rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/src/main/resources/env.json diff --git a/camel-k-quarkus/camel-k-quarkus-knative/it/src/test/java/org/apache/camel/k/quarkus/knative/deployment/ExtensionIT.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/src/test/java/org/apache/camel/k/quarkus/knative/deployment/ExtensionIT.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-knative/it/src/test/java/org/apache/camel/k/quarkus/knative/deployment/ExtensionIT.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/src/test/java/org/apache/camel/k/quarkus/knative/deployment/ExtensionIT.java diff --git a/camel-k-quarkus/camel-k-quarkus-knative/it/src/test/java/org/apache/camel/k/quarkus/knative/deployment/ExtensionTest.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/src/test/java/org/apache/camel/k/quarkus/knative/deployment/ExtensionTest.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-knative/it/src/test/java/org/apache/camel/k/quarkus/knative/deployment/ExtensionTest.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-knative/src/test/java/org/apache/camel/k/quarkus/knative/deployment/ExtensionTest.java diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/it/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/pom.xml similarity index 98% rename from camel-k-quarkus/camel-k-quarkus-loader-js/it/pom.xml rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/pom.xml index 268bccd..4db4a10 100644 --- a/camel-k-quarkus/camel-k-quarkus-loader-js/it/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/pom.xml @@ -20,12 +20,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-quarkus-loader-js-parent</artifactId> + <artifactId>camel-k-quarkus-itests</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-k-quarkus-loader-js-it</artifactId> + <artifactId>camel-k-quarkus-itests-loader-js</artifactId> <dependencies> <dependency> diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/Application.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/Application.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-js/it/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/Application.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/src/main/java/org/apache/camel/k/loader/js/quarkus/deployment/Application.java diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/src/main/resources/application.properties similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-js/it/src/main/resources/application.properties rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/src/main/resources/application.properties diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/test/java/org/apache/camel/k/loader/js/quarkus/deployment/ExtensionIT.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/deployment/ExtensionIT.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-js/it/src/test/java/org/apache/camel/k/loader/js/quarkus/deployment/ExtensionIT.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/deployment/ExtensionIT.java diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/test/java/org/apache/camel/k/loader/js/quarkus/deployment/ExtensionTest.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/deployment/ExtensionTest.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-js/it/src/test/java/org/apache/camel/k/loader/js/quarkus/deployment/ExtensionTest.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/deployment/ExtensionTest.java diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/test/resources/routes.js b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/src/test/resources/routes.js similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-js/it/src/test/resources/routes.js rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-js/src/test/resources/routes.js diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/it/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/pom.xml similarity index 98% rename from camel-k-quarkus/camel-k-quarkus-loader-xml/it/pom.xml rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/pom.xml index b09eefc..0aceb75 100644 --- a/camel-k-quarkus/camel-k-quarkus-loader-xml/it/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/pom.xml @@ -20,12 +20,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-quarkus-loader-xml-parent</artifactId> + <artifactId>camel-k-quarkus-itests</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-k-quarkus-loader-xml-it</artifactId> + <artifactId>camel-k-quarkus-itests-loader-xml</artifactId> <dependencies> <dependency> diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/Application.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/Application.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/Application.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/Application.java diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/src/main/resources/application.properties similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/main/resources/application.properties rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/src/main/resources/application.properties diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/test/java/org/apache/camel/k/loader/xml/quarkus/deployment/ExtensionIT.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/deployment/ExtensionIT.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/test/java/org/apache/camel/k/loader/xml/quarkus/deployment/ExtensionIT.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/deployment/ExtensionIT.java diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/test/java/org/apache/camel/k/loader/xml/quarkus/deployment/ExtensionTest.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/deployment/ExtensionTest.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/test/java/org/apache/camel/k/loader/xml/quarkus/deployment/ExtensionTest.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/deployment/ExtensionTest.java diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/test/resources/routes.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/src/test/resources/routes.xml similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/test/resources/routes.xml rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-xml/src/test/resources/routes.xml diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/pom.xml similarity index 98% rename from camel-k-quarkus/camel-k-quarkus-loader-yaml/it/pom.xml rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/pom.xml index 733a071..9053db2 100644 --- a/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/pom.xml @@ -20,12 +20,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-quarkus-loader-yaml-parent</artifactId> + <artifactId>camel-k-quarkus-itests</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-k-quarkus-loader-yaml-it</artifactId> + <artifactId>camel-k-quarkus-itests-loader-yaml</artifactId> <dependencies> <dependency> diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/Application.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/Application.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/Application.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/Application.java diff --git a/camel-k-quarkus/camel-k-quarkus-knative/it/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/src/main/resources/application.properties similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-knative/it/src/main/resources/application.properties rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/src/main/resources/application.properties diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/test/java/org/apache/camel/k/loader/yaml/quarkus/deployment/ExtensionIT.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/deployment/ExtensionIT.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/test/java/org/apache/camel/k/loader/yaml/quarkus/deployment/ExtensionIT.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/deployment/ExtensionIT.java diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/test/java/org/apache/camel/k/loader/yaml/quarkus/deployment/ExtensionTest.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/deployment/ExtensionTest.java similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/test/java/org/apache/camel/k/loader/yaml/quarkus/deployment/ExtensionTest.java rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/deployment/ExtensionTest.java diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/test/resources/routes.yaml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/src/test/resources/routes.yaml similarity index 100% rename from camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/test/resources/routes.yaml rename to camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-loader-yaml/src/test/resources/routes.yaml diff --git a/camel-k-quarkus/camel-k-quarkus-cron/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/pom.xml similarity index 77% copy from camel-k-quarkus/camel-k-quarkus-cron/pom.xml copy to camel-k-quarkus/camel-k-quarkus-itests/pom.xml index 9ae1a12..fb317cf 100644 --- a/camel-k-quarkus/camel-k-quarkus-cron/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-itests/pom.xml @@ -26,12 +26,15 @@ <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <artifactId>camel-k-quarkus-cron-parent</artifactId> + <artifactId>camel-k-quarkus-itests</artifactId> <modules> - <module>runtime</module> - <module>deployment</module> - <module>it</module> + <module>camel-k-quarkus-itests-core</module> + <module>camel-k-quarkus-itests-cron</module> + <module>camel-k-quarkus-itests-knative</module> + <module>camel-k-quarkus-itests-loader-js</module> + <module>camel-k-quarkus-itests-loader-xml</module> + <module>camel-k-quarkus-itests-loader-yaml</module> </modules> </project> diff --git a/camel-k-quarkus/camel-k-quarkus-knative/pom.xml b/camel-k-quarkus/camel-k-quarkus-knative/pom.xml index 8f64b59..a6b81b3 100644 --- a/camel-k-quarkus/camel-k-quarkus-knative/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-knative/pom.xml @@ -31,7 +31,6 @@ <modules> <module>runtime</module> <module>deployment</module> - <module>it</module> </modules> </project> diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml index 846f151..75c1336 100644 --- a/camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml @@ -31,7 +31,6 @@ <modules> <module>runtime</module> <module>deployment</module> - <module>it</module> </modules> </project> diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml index c3e98b7..2cbe561 100644 --- a/camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml @@ -31,7 +31,6 @@ <modules> <module>runtime</module> <module>deployment</module> - <module>it</module> </modules> </project> diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.xml index 27b7cec..4dcdb32 100644 --- a/camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.xml +++ b/camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.xml @@ -31,7 +31,6 @@ <modules> <module>runtime</module> <module>deployment</module> - <module>it</module> </modules> </project> diff --git a/camel-k-quarkus/pom.xml b/camel-k-quarkus/pom.xml index 539bbbf..45b1680 100644 --- a/camel-k-quarkus/pom.xml +++ b/camel-k-quarkus/pom.xml @@ -53,6 +53,8 @@ <module>camel-k-quarkus-cron</module> <module>camel-k-runtime-quarkus</module> + + <module>camel-k-quarkus-itests</module> </modules> </project>