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 ec37eda7902fa20e5b59b383b86ba360ea6a85f3 Author: Otavio Rodolfo Piske <opi...@redhat.com> AuthorDate: Wed Jun 2 09:14:44 2021 +0200 Fixed YAML loader tests for Camel Quarkus 2.0.0 / Camel 3.10 --- itests/camel-k-itests-loader-yaml/pom.xml | 19 ++----------------- .../camel/k/loader/yaml/quarkus/Application.java | 4 ++-- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/itests/camel-k-itests-loader-yaml/pom.xml b/itests/camel-k-itests-loader-yaml/pom.xml index 7e88866..3bf1be7 100644 --- a/itests/camel-k-itests-loader-yaml/pom.xml +++ b/itests/camel-k-itests-loader-yaml/pom.xml @@ -35,8 +35,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> @@ -67,21 +67,6 @@ <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-loader-yaml-deployment</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-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java b/itests/camel-k-itests-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java index 926f80d..6b145af 100644 --- a/itests/camel-k-itests-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java +++ b/itests/camel-k-itests-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java @@ -19,6 +19,7 @@ package org.apache.camel.k.loader.yaml.quarkus; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import javax.json.JsonObject; +import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; @@ -26,7 +27,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.apache.camel.CamelContext; -import org.apache.camel.Consume; import org.apache.camel.k.loader.support.LoaderSupport; @Path("/test") @@ -37,7 +37,7 @@ public class Application { @POST @Path("/load-routes/{name}") - @Consume(MediaType.TEXT_PLAIN) + @Consumes(MediaType.TEXT_PLAIN) @Produces(MediaType.APPLICATION_JSON) public JsonObject loadRoutes(@PathParam("name") String name, String code) throws Exception { return LoaderSupport.inspectSource(context, name + ".yaml", code);