Skip to content

SHIRO-729 - Updating Quartz to 2.3.2 #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fpapon merged 1 commit into from
Nov 15, 2019
Merged

SHIRO-729 - Updating Quartz to 2.3.2 #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 4 additions & 2 deletions support/features/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions support/features/src/main/resources/features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions support/quartz/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down
25 changes: 17 additions & 8 deletions ...z/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,6 +34,8 @@
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
Expand Down Expand Up @@ -153,12 +158,16 @@ public void enableSessionValidation() {
}

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();
Expand Down Expand Up @@ -207,7 +216,7 @@ public void disableSessionValidation() {
}

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.");
}
Expand Down Expand Up @@ -235,4 +244,4 @@ public void disableSessionValidation() {


}
}
}