This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c07014ae424eaa72e3797a48c9ca09d58128ef0d Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Wed Jun 26 09:01:34 2024 +0200 Fiexd junit5 + generated poms --- poms/bom/pom.xml | 8 ++++++++ poms/bom/src/main/generated/flattened-full-pom.xml | 8 ++++++++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 ++++++++ poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 ++++++++ .../org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java | 2 +- 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 4d0918c222..50df7ee791 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -889,6 +889,14 @@ <artifactId>camel-drill</artifactId> <version>${camel.version}</version> <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> <exclusion> <groupId>com.google.guava</groupId> <artifactId>listenablefuture</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index f5dcdf68e7..c3bf52c8cd 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -827,6 +827,14 @@ <artifactId>camel-drill</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.7.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>logback-classic</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>logback-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> <exclusion> <groupId>com.google.guava</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>listenablefuture</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 1e75e8b57d..e65de42a1a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -827,6 +827,14 @@ <artifactId>camel-drill</artifactId> <version>4.7.0-SNAPSHOT</version> <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> <exclusion> <groupId>com.google.guava</groupId> <artifactId>listenablefuture</artifactId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 2fc626a507..c8f2f22454 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -827,6 +827,14 @@ <artifactId>camel-drill</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.7.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>logback-classic</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>logback-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> <exclusion> <groupId>com.google.guava</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>listenablefuture</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index 41b6ac8317..a69f45f17f 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -195,7 +195,6 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport */ protected void bindToRegistry(Registry registry) throws Exception { assertTestClassCamelContextMatchesAppCamelContext(); - super.bindToRegistry(registry); } /** @@ -495,6 +494,7 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport Exchange exchange, Processor processor, ProcessorDefinition<?> definition, String id, String label, long timeTaken) { } + Set<String> getCreatedRoutes() { return createdRoutes; }