This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 5e5964e50c3d790b7b6df3edc07b4f6104006545 Author: Otavio Rodolfo Piske <opi...@redhat.com> AuthorDate: Wed Jun 2 09:38:27 2021 +0200 Fixed knative tests for Camel Quarkus 2.0.0 / Camel 3.10 --- .../pom.xml | 20 ++++---------------- .../camel-k-itests-knative-env-from-registry/pom.xml | 17 ++--------------- itests/camel-k-itests-knative-sinkbinding/pom.xml | 20 ++++---------------- itests/camel-k-itests-knative-source-groovy/pom.xml | 13 ------------- itests/camel-k-itests-knative-source-yaml/pom.xml | 20 ++++---------------- itests/camel-k-itests-knative/pom.xml | 20 ++++---------------- 6 files changed, 18 insertions(+), 92 deletions(-) diff --git a/itests/camel-k-itests-knative-env-from-properties/pom.xml b/itests/camel-k-itests-knative-env-from-properties/pom.xml index 571bcdf..c8ebc97 100644 --- a/itests/camel-k-itests-knative-env-from-properties/pom.xml +++ b/itests/camel-k-itests-knative-env-from-properties/pom.xml @@ -45,11 +45,12 @@ <artifactId>camel-k-knative-consumer</artifactId> </dependency> - <!-- camel quarkus --> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml</artifactId> + <groupId>org.apache.camel</groupId> + <artifactId>camel-yaml-dsl</artifactId> </dependency> + + <!-- camel quarkus --> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-direct</artifactId> @@ -112,19 +113,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/itests/camel-k-itests-knative-env-from-registry/pom.xml b/itests/camel-k-itests-knative-env-from-registry/pom.xml index c76a7a0..d4a3d7f 100644 --- a/itests/camel-k-itests-knative-env-from-registry/pom.xml +++ b/itests/camel-k-itests-knative-env-from-registry/pom.xml @@ -47,8 +47,8 @@ <!-- camel quarkus --> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml</artifactId> + <groupId>org.apache.camel</groupId> + <artifactId>camel-yaml-dsl</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> @@ -112,19 +112,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/itests/camel-k-itests-knative-sinkbinding/pom.xml b/itests/camel-k-itests-knative-sinkbinding/pom.xml index e7cabac..13040eb 100644 --- a/itests/camel-k-itests-knative-sinkbinding/pom.xml +++ b/itests/camel-k-itests-knative-sinkbinding/pom.xml @@ -41,11 +41,12 @@ <artifactId>camel-k-knative-producer</artifactId> </dependency> - <!-- camel quarkus --> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml</artifactId> + <groupId>org.apache.camel</groupId> + <artifactId>camel-yaml-dsl</artifactId> </dependency> + + <!-- camel quarkus --> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-direct</artifactId> @@ -108,19 +109,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <profiles> diff --git a/itests/camel-k-itests-knative-source-groovy/pom.xml b/itests/camel-k-itests-knative-source-groovy/pom.xml index 6a94d02..7857617 100644 --- a/itests/camel-k-itests-knative-source-groovy/pom.xml +++ b/itests/camel-k-itests-knative-source-groovy/pom.xml @@ -121,19 +121,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-groovy</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/itests/camel-k-itests-knative-source-yaml/pom.xml b/itests/camel-k-itests-knative-source-yaml/pom.xml index 38dfd80..99b3cd6 100644 --- a/itests/camel-k-itests-knative-source-yaml/pom.xml +++ b/itests/camel-k-itests-knative-source-yaml/pom.xml @@ -45,11 +45,12 @@ <artifactId>camel-k-knative-consumer</artifactId> </dependency> - <!-- camel quarkus --> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml</artifactId> + <groupId>org.apache.camel</groupId> + <artifactId>camel-yaml-dsl</artifactId> </dependency> + + <!-- camel quarkus --> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-direct</artifactId> @@ -121,19 +122,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/itests/camel-k-itests-knative/pom.xml b/itests/camel-k-itests-knative/pom.xml index 4ecefe6..2633ebc 100644 --- a/itests/camel-k-itests-knative/pom.xml +++ b/itests/camel-k-itests-knative/pom.xml @@ -45,11 +45,12 @@ <artifactId>camel-k-knative-consumer</artifactId> </dependency> - <!-- camel quarkus --> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml</artifactId> + <groupId>org.apache.camel</groupId> + <artifactId>camel-yaml-dsl</artifactId> </dependency> + + <!-- camel quarkus --> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-direct</artifactId> @@ -112,19 +113,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-loader-yaml</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <profiles>