You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2014/08/21 00:22:39 UTC
git commit: DELTASPIKE-692 workaround for tests which don't use
optional classes
Repository: deltaspike
Updated Branches:
refs/heads/master 746f88937 -> a9254ee54
DELTASPIKE-692 workaround for tests which don't use optional classes
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a9254ee5
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a9254ee5
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a9254ee5
Branch: refs/heads/master
Commit: a9254ee540eca99e39157fac08bfdddabf3ee270
Parents: 746f889
Author: gpetracek <gp...@apache.org>
Authored: Wed Aug 20 23:58:35 2014 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Wed Aug 20 23:58:35 2014 +0200
----------------------------------------------------------------------
deltaspike/modules/scheduler/impl/pom.xml | 2 +-
.../test/scheduler/custom/CustomSchedulerWarFileTest.java | 2 ++
.../deltaspike/test/scheduler/custom/ScopeNotStartedTest.java | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a9254ee5/deltaspike/modules/scheduler/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/pom.xml b/deltaspike/modules/scheduler/impl/pom.xml
index 9e08185..5957ac9 100644
--- a/deltaspike/modules/scheduler/impl/pom.xml
+++ b/deltaspike/modules/scheduler/impl/pom.xml
@@ -58,7 +58,7 @@
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.2.1</version>
- <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a9254ee5/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 4519235..0b08030 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
@@ -29,6 +29,7 @@ import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.runner.RunWith;
+import org.quartz.Job;
@RunWith(Arquillian.class)
public class CustomSchedulerWarFileTest extends CustomSchedulerTest
@@ -41,6 +42,7 @@ public class CustomSchedulerWarFileTest extends CustomSchedulerTest
JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "customSchedulerTest.jar")
.addPackage(CustomSchedulerWarFileTest.class.getPackage().getName())
+ .addPackage(Job.class.getPackage().getName())
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsResource(new StringAsset(MockedScheduler.class.getName()),
"META-INF/services/" + Scheduler.class.getName())
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a9254ee5/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/ScopeNotStartedTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/ScopeNotStartedTest.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/ScopeNotStartedTest.java
index 9f71d24..8ae7ddd 100644
--- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/ScopeNotStartedTest.java
+++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/ScopeNotStartedTest.java
@@ -31,6 +31,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.quartz.Job;
import javax.inject.Inject;
@@ -46,6 +47,7 @@ public class ScopeNotStartedTest
JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "scopeNotStartedTest.jar")
.addPackage(CustomSchedulerWarFileTest.class.getPackage().getName())
+ .addPackage(Job.class.getPackage().getName())
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsResource(new StringAsset(MockedScheduler.class.getName()),
"META-INF/services/" + Scheduler.class.getName())