Skip to content

Commit b43fc7a

Browse files
committed
Building against Quartz 2.2.1 and JavaMail 1.5.2
1 parent b64b308 commit b43fc7a

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ configure(allprojects) { project ->
156156
"http://aopalliance.sourceforge.net/doc/",
157157
"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
158158
"http://ehcache.org/apidocs/",
159-
"http://quartz-scheduler.org/api/2.1.7/",
159+
"http://quartz-scheduler.org/api/2.2.0/",
160160
"http://fasterxml.github.com/jackson-core/javadoc/2.3.0/",
161161
"http://fasterxml.github.com/jackson-databind/javadoc/2.3.0/",
162162
"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs"
@@ -571,11 +571,11 @@ project("spring-context-support") {
571571
compile(project(":spring-context"))
572572
optional(project(":spring-jdbc")) // for Quartz support
573573
optional(project(":spring-tx")) // for Quartz support
574-
optional("javax.mail:javax.mail-api:1.4.7")
574+
optional("javax.mail:javax.mail-api:1.5.2")
575575
optional("javax.cache:cache-api:1.0.0")
576576
optional("com.google.guava:guava:17.0")
577-
optional("net.sf.ehcache:ehcache-core:2.6.5")
578-
optional("org.quartz-scheduler:quartz:2.1.7")
577+
optional("net.sf.ehcache:ehcache-core:2.6.7")
578+
optional("org.quartz-scheduler:quartz:2.2.1")
579579
optional("org.codehaus.fabric3.api:commonj:1.1.0")
580580
optional("org.apache.velocity:velocity:1.7")
581581
optional("org.freemarker:freemarker:2.3.20")
@@ -592,7 +592,7 @@ project("spring-context-support") {
592592
testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
593593
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
594594
testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
595-
testRuntime("com.sun.mail:javax.mail:1.4.7")
595+
testRuntime("com.sun.mail:javax.mail:1.5.2")
596596
}
597597

598598
// pick up **/*.types files in src/main
@@ -901,7 +901,7 @@ project("spring-test") {
901901
testCompile(project(":spring-context-support"))
902902
testCompile(project(":spring-oxm"))
903903
testCompile(project(":spring-webmvc-tiles3"))
904-
testCompile("javax.mail:javax.mail-api:1.4.7")
904+
testCompile("javax.mail:javax.mail-api:1.5.2")
905905
testCompile("javax.ejb:ejb-api:3.0")
906906
testCompile("org.hibernate:hibernate-core:${hibernate3Version}") {
907907
exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.0-api'
@@ -964,7 +964,7 @@ project("spring-aspects") {
964964
optional("javax.cache:cache-api:1.0.0")
965965
testCompile(project(":spring-core")) // for CodeStyleAspect
966966
testCompile(project(":spring-test"))
967-
testCompile("javax.mail:javax.mail-api:1.4.7")
967+
testCompile("javax.mail:javax.mail-api:1.5.2")
968968
}
969969

970970
eclipse.project {

spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2014 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -58,6 +58,7 @@
5858
* @see org.springframework.jdbc.datasource.DataSourceUtils#doGetConnection
5959
* @see org.springframework.jdbc.datasource.DataSourceUtils#releaseConnection
6060
*/
61+
@SuppressWarnings("unchecked") // due to a warning in Quartz 2.2's JobStoreCMT
6162
public class LocalDataSourceJobStore extends JobStoreCMT {
6263

6364
/**

0 commit comments

Comments
 (0)