This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 5163271e63c1996ce1e125829334e3de99b1a980 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Jun 17 08:40:28 2022 +0200 Camel 18184/camel test blueprint junit5 --- bom/camel-karaf-bom/pom.xml | 5 +++++ pom.xml | 5 +++++ tests/camel-blueprint-test/pom.xml | 2 +- .../blueprint/BlueprintResolveComponentFromCamelContextTest.java | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bom/camel-karaf-bom/pom.xml b/bom/camel-karaf-bom/pom.xml index a09cea76..c90ed4fe 100644 --- a/bom/camel-karaf-bom/pom.xml +++ b/bom/camel-karaf-bom/pom.xml @@ -91,6 +91,11 @@ <artifactId>camel-test-blueprint</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel.karaf</groupId> + <artifactId>camel-test-blueprint-junit5</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.camel.karaf</groupId> <artifactId>camel-test-karaf</artifactId> diff --git a/pom.xml b/pom.xml index 999baaaf..d1f80395 100644 --- a/pom.xml +++ b/pom.xml @@ -362,6 +362,11 @@ <artifactId>camel-test-blueprint</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel.karaf</groupId> + <artifactId>camel-test-blueprint-junit5</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.camel.karaf</groupId> <artifactId>camel-cxf-blueprint</artifactId> diff --git a/tests/camel-blueprint-test/pom.xml b/tests/camel-blueprint-test/pom.xml index ad1aaa2c..aa225032 100644 --- a/tests/camel-blueprint-test/pom.xml +++ b/tests/camel-blueprint-test/pom.xml @@ -39,7 +39,7 @@ </dependency> <dependency> <groupId>org.apache.camel.karaf</groupId> - <artifactId>camel-test-blueprint</artifactId> + <artifactId>camel-test-blueprint-junit5</artifactId> <scope>test</scope> </dependency> diff --git a/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java b/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java index 8f8d7ba6..4563db54 100644 --- a/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java +++ b/tests/camel-blueprint-test/src/test/java/org/apache/camel/blueprint/BlueprintResolveComponentFromCamelContextTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.blueprint.CamelBlueprintTestSupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BlueprintResolveComponentFromCamelContextTest extends CamelBlueprintTestSupport { diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index 4799aa3f..83d4bd5b 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -68,7 +68,7 @@ </dependency> <dependency> <groupId>org.apache.camel.karaf</groupId> - <artifactId>camel-blueprint</artifactId> + <artifactId>camel-test-blueprint-junit5</artifactId> <scope>test</scope> </dependency> <dependency>