Skip to content

Commit bdbcc4f

Browse files
committed
Merge branch '5.3.x'
# Conflicts: # build.gradle
2 parents 3e6eb98 + 79804d9 commit bdbcc4f

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,25 @@ configure(allprojects) { project ->
6969
dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
7070

7171
dependency "com.fasterxml:aalto-xml:1.3.0"
72-
dependency("com.fasterxml.woodstox:woodstox-core:6.2.6") {
72+
dependency("com.fasterxml.woodstox:woodstox-core:6.2.7") {
7373
exclude group: "stax", name: "stax-api"
7474
}
75-
dependency "com.google.code.gson:gson:2.8.8"
76-
dependency "com.google.protobuf:protobuf-java-util:3.18.0"
75+
dependency "com.google.code.gson:gson:2.8.9"
76+
dependency "com.google.protobuf:protobuf-java-util:3.19.1"
7777
dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
7878
dependency("com.thoughtworks.xstream:xstream:1.4.18") {
7979
exclude group: "xpp3", name: "xpp3_min"
8080
exclude group: "xmlpull", name: "xmlpull"
8181
}
82-
dependency "org.eclipse:yasson:2.0.2"
82+
dependency "org.eclipse:yasson:2.0.3"
8383
dependency("org.codehaus.jettison:jettison:1.3.8") {
8484
exclude group: "stax", name: "stax-api"
8585
}
8686
dependency "org.ogce:xpp3:1.1.6"
8787
dependency "org.yaml:snakeyaml:1.29"
8888

8989
dependency "com.h2database:h2:1.4.200"
90-
dependency "com.github.ben-manes.caffeine:caffeine:3.0.4"
90+
dependency "com.github.ben-manes.caffeine:caffeine:3.0.5"
9191
dependency "com.github.librepdf:openpdf:1.3.26"
9292
dependency "com.rometools:rome:1.16.0"
9393
dependency "commons-io:commons-io:2.5"

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2021 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.
@@ -39,7 +39,8 @@
3939
* Subclass of Quartz's {@link JobStoreCMT} class that delegates to a Spring-managed
4040
* {@link DataSource} instead of using a Quartz-managed JDBC connection pool.
4141
* This JobStore will be used if SchedulerFactoryBean's "dataSource" property is set.
42-
* You may also configure it explicitly, possibly as a custom subclass of this class.
42+
* You may also configure it explicitly, possibly as a custom subclass of this
43+
* {@code LocalDataSourceJobStore} or as an equivalent {@code JobStoreCMT} variant.
4344
*
4445
* <p>Supports both transactional and non-transactional DataSource access.
4546
* With a non-XA DataSource and local Spring transactions, a single DataSource

0 commit comments

Comments
 (0)