Repository: camel Updated Branches: refs/heads/master 9f460adbe -> 900645095
Camel CDI: Use camel-cdi JAR in integration tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/90064509 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/90064509 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/90064509 Branch: refs/heads/master Commit: 900645095e52ba44b8922bea42d8c4b06687c3ec Parents: 9f460ad Author: Antonin Stefanutti <[email protected]> Authored: Tue Dec 13 13:05:14 2016 +0100 Committer: Antonin Stefanutti <[email protected]> Committed: Tue Dec 13 13:05:14 2016 +0100 ---------------------------------------------------------------------- tests/camel-itest-cdi/pom.xml | 7 +++++++ .../org/apache/camel/itest/cdi/CamelCdiTest.java | 15 ++++++++------- .../camel/itest/cdi/PropertiesConfigurationTest.java | 11 ++++++----- 3 files changed, 21 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/90064509/tests/camel-itest-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-cdi/pom.xml b/tests/camel-itest-cdi/pom.xml index 7119f40..69610e7 100644 --- a/tests/camel-itest-cdi/pom.xml +++ b/tests/camel-itest-cdi/pom.xml @@ -75,6 +75,13 @@ <version>${arquillian-version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-depchain</artifactId> + <version>${shrinkwrap-resolver-version}</version> + <type>pom</type> + <scope>test</scope> + </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/camel/blob/90064509/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/CamelCdiTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/CamelCdiTest.java b/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/CamelCdiTest.java index 39aa971..03a62f8 100644 --- a/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/CamelCdiTest.java +++ b/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/CamelCdiTest.java @@ -24,16 +24,14 @@ import javax.inject.Inject; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.ProducerTemplate; -import org.apache.camel.cdi.CdiCamelExtension; import org.apache.camel.cdi.ContextName; import org.apache.camel.cdi.Uri; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.CamelContextHelper; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; @@ -71,14 +69,17 @@ public class CamelCdiTest { @Deployment public static JavaArchive createDeployment() { - return ShrinkWrap.create(JavaArchive.class) - .addPackage(CdiCamelExtension.class.getPackage()) + return Maven.configureResolver().workOffline() + .loadPomFromFile("pom.xml") + .resolve("org.apache.camel:camel-cdi") + .withoutTransitivity() + .asSingle(JavaArchive.class) .addClasses( RoutesContextA.class, RoutesContextB.class, RoutesContextC.class, - RoutesContextD.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + RoutesContextD.class + ); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/90064509/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/PropertiesConfigurationTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/PropertiesConfigurationTest.java b/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/PropertiesConfigurationTest.java index 2ac0b4d..a4b8f60 100644 --- a/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/PropertiesConfigurationTest.java +++ b/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/PropertiesConfigurationTest.java @@ -27,9 +27,8 @@ import org.apache.camel.cdi.CdiCamelExtension; import org.apache.camel.component.properties.PropertiesComponent; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.junit.Test; import org.junit.runner.RunWith; @@ -59,9 +58,11 @@ public class PropertiesConfigurationTest { @Deployment public static JavaArchive createDeployment() { - return ShrinkWrap.create(JavaArchive.class) - .addPackage(CdiCamelExtension.class.getPackage()) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + return Maven.configureResolver().workOffline() + .loadPomFromFile("pom.xml") + .resolve("org.apache.camel:camel-cdi") + .withoutTransitivity() + .asSingle(JavaArchive.class); } @Test
