This is an automated email from the ASF dual-hosted git repository.
fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/master by this push:
new 764b09c SHIRO-729 - Updating Quartz to 2.3.2
new bb1a63a Merge pull request #178 from coheigea/SHIRO-729
764b09c is described below
commit 764b09c3374fe93bd318543eae0c05bbb5ddc36e
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Fri Nov 15 10:17:23 2019 +0000
SHIRO-729 - Updating Quartz to 2.3.2
---
pom.xml | 12 +++--------
support/features/pom.xml | 6 ++++--
support/features/src/main/resources/features.xml | 2 ++
support/quartz/pom.xml | 4 ++--
.../quartz/QuartzSessionValidationScheduler.java | 25 +++++++++++++++-------
5 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index 96292bd..33e7eac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
<jetty.version>9.4.20.v20190813</jetty.version>
<!-- Don't change this version without also changing the shiro-quartz
and shiro-features
modules' OSGi metadata: -->
- <quartz.version>1.6.1</quartz.version>
+ <quartz.version>2.3.2</quartz.version>
<slf4j.version>1.7.26</slf4j.version>
<logback.version>1.2.3</logback.version>
<log4j.version>1.2.17</log4j.version>
@@ -370,7 +370,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>5.2.2</version>
+ <version>5.2.4</version>
</plugin>
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
@@ -1164,16 +1164,10 @@
<version>${guice.version}</version>
</dependency>
<dependency>
- <groupId>org.opensymphony.quartz</groupId>
+ <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>${quartz.version}</version>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.github.mjeanroy</groupId>
diff --git a/support/features/pom.xml b/support/features/pom.xml
index e387378..4304d90 100644
--- a/support/features/pom.xml
+++ b/support/features/pom.xml
@@ -33,12 +33,14 @@
<properties>
<aspectj.bundle.version>1.9.4_1</aspectj.bundle.version>
+ <c3p0-bundle-version>0.9.5.4_1</c3p0-bundle-version>
<ehcache.bundle.version>2.6.11_1</ehcache.bundle.version>
- <quartz.bundle.version>1.6.1_1</quartz.bundle.version>
+ <hikaricp-version>2.4.13</hikaricp-version>
+ <quartz.bundle.version>2.3.2_1</quartz.bundle.version>
<!-- Not a Shiro dependency - used for quartz bundle resolution only
(see features.xml): -->
<commons.collections.version>3.2.2</commons.collections.version>
<!-- karaf plugin version -->
- <karaf.version>4.2.6</karaf.version>
+ <karaf.version>4.2.7</karaf.version>
</properties>
<dependencies>
diff --git a/support/features/src/main/resources/features.xml
b/support/features/src/main/resources/features.xml
index 6486d90..ecb4628 100644
--- a/support/features/src/main/resources/features.xml
+++ b/support/features/src/main/resources/features.xml
@@ -75,6 +75,8 @@
<feature name="shiro-quartz" version="${project.version}">
<feature version="${project.version}">shiro-core</feature>
<bundle
dependency='true'>mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.c3p0/${c3p0-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:com.zaxxer/HikariCP-java7/${hikaricp-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
<bundle>mvn:org.apache.shiro/shiro-quartz/${project.version}</bundle>
</feature>
diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml
index 7f90d64..31957ef 100644
--- a/support/quartz/pom.xml
+++ b/support/quartz/pom.xml
@@ -37,7 +37,7 @@
<artifactId>shiro-core</artifactId>
</dependency>
<dependency>
- <groupId>org.opensymphony.quartz</groupId>
+ <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</dependency>
<!-- Test dependencies -->
@@ -67,7 +67,7 @@
<Export-Package>org.apache.shiro.session.mgt.quartz*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
- org.quartz*;version="[1.6, 2)",
+ org.quartz*;version="[1.7.2, 3)",
*
</Import-Package>
</instructions>
diff --git
a/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java
b/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java
index 6445cc2..5cb6241 100644
---
a/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java
+++
b/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java
@@ -18,10 +18,13 @@
*/
package org.apache.shiro.session.mgt.quartz;
+import org.quartz.JobBuilder;
import org.quartz.JobDetail;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.SimpleTrigger;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerKey;
import org.quartz.impl.StdSchedulerFactory;
import org.slf4j.Logger;
@@ -31,6 +34,8 @@ import org.apache.shiro.session.mgt.DefaultSessionManager;
import org.apache.shiro.session.mgt.SessionValidationScheduler;
import org.apache.shiro.session.mgt.ValidatingSessionManager;
+import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
+
/**
* An implementation of the {@link
org.apache.shiro.session.mgt.SessionValidationScheduler
SessionValidationScheduler} that uses Quartz to schedule a
@@ -153,12 +158,16 @@ public class QuartzSessionValidationScheduler implements
SessionValidationSchedu
}
try {
- SimpleTrigger trigger = new SimpleTrigger(getClass().getName(),
- Scheduler.DEFAULT_GROUP,
- SimpleTrigger.REPEAT_INDEFINITELY,
- sessionValidationInterval);
-
- JobDetail detail = new JobDetail(JOB_NAME,
Scheduler.DEFAULT_GROUP, QuartzSessionValidationJob.class);
+ TriggerBuilder<SimpleTrigger> triggerBuilder =
+ TriggerBuilder.newTrigger()
+ .withIdentity(getClass().getName(),
Scheduler.DEFAULT_GROUP)
+ .withSchedule(simpleSchedule()
+ .withIntervalInMilliseconds(sessionValidationInterval)
+ .withRepeatCount(SimpleTrigger.REPEAT_INDEFINITELY));
+ SimpleTrigger trigger = triggerBuilder.build();
+
+ JobDetail detail =
JobBuilder.newJob(QuartzSessionValidationJob.class)
+ .withIdentity(JOB_NAME,
Scheduler.DEFAULT_GROUP).build();
detail.getJobDataMap().put(QuartzSessionValidationJob.SESSION_MANAGER_KEY,
sessionManager);
Scheduler scheduler = getScheduler();
@@ -207,7 +216,7 @@ public class QuartzSessionValidationScheduler implements
SessionValidationSchedu
}
try {
- scheduler.unscheduleJob(JOB_NAME, Scheduler.DEFAULT_GROUP);
+ scheduler.unscheduleJob(TriggerKey.triggerKey(JOB_NAME,
Scheduler.DEFAULT_GROUP));
if (log.isDebugEnabled()) {
log.debug("Quartz session validation job stopped
successfully.");
}
@@ -235,4 +244,4 @@ public class QuartzSessionValidationScheduler implements
SessionValidationSchedu
}
-}
\ No newline at end of file
+}
