Repository: deltaspike Updated Branches: refs/heads/master f1825fbae -> 6c476043e
DELTASPIKE-999 add quartz to the test-deployment-archive to avoid issues with containers which don't support optional classes Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/6c476043 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/6c476043 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/6c476043 Branch: refs/heads/master Commit: 6c476043ed7cfe3da4e90d20bef36b34deb52b93 Parents: f1825fb Author: gpetracek <[email protected]> Authored: Fri Oct 9 18:43:57 2015 +0200 Committer: gpetracek <[email protected]> Committed: Fri Oct 9 18:43:57 2015 +0200 ---------------------------------------------------------------------- deltaspike/modules/scheduler/impl/pom.xml | 15 +++++++++++++++ .../scheduler/custom/CustomSchedulerWarFileTest.java | 6 +++++- .../apache/deltaspike/test/util/ArchiveUtils.java | 3 +-- 3 files changed, 21 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6c476043/deltaspike/modules/scheduler/impl/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/scheduler/impl/pom.xml b/deltaspike/modules/scheduler/impl/pom.xml index 2bd1652..759fb32 100644 --- a/deltaspike/modules/scheduler/impl/pom.xml +++ b/deltaspike/modules/scheduler/impl/pom.xml @@ -40,6 +40,7 @@ !org.apache.deltaspike.scheduler.impl.*, * </deltaspike.osgi.import> + <shrinkwrap.version>2.0.0</shrinkwrap.version> </properties> <dependencies> @@ -84,6 +85,20 @@ <artifactId>deltaspike-core-impl</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-bom</artifactId> + <version>${shrinkwrap.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-impl-maven</artifactId> + <version>${shrinkwrap.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6c476043/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerWarFileTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerWarFileTest.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerWarFileTest.java index fe3367d..3868f8e 100644 --- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerWarFileTest.java +++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerWarFileTest.java @@ -28,8 +28,8 @@ import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.junit.runner.RunWith; -import org.quartz.Job; @RunWith(Arquillian.class) public class CustomSchedulerWarFileTest extends CustomSchedulerTest @@ -50,6 +50,10 @@ public class CustomSchedulerWarFileTest extends CustomSchedulerTest return ShrinkWrap.create(WebArchive.class, archiveName + ".war") .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndSchedulerArchive()) + .addAsLibraries(Maven.resolver().loadPomFromFile("pom.xml").resolve( + "org.quartz-scheduler:quartz") + .withTransitivity() + .asFile()) .addAsLibraries(testJar) .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6c476043/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java index ebed8b3..7ddbf73 100644 --- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java +++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java @@ -37,8 +37,7 @@ public class ArchiveUtils "META-INF/beans.xml", new String[]{"org.apache.deltaspike.core", "org.apache.deltaspike.test.category", - "org.apache.deltaspike.scheduler", - "org.quartz"}, + "org.apache.deltaspike.scheduler"}, null, "ds-core_and_scheduler"); }
