Andy Wilkinson
516d0eff3a
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
17b38dc264
Upgrade to Spring Data Releasetrain Ingalls-SR17
...
Closes gh-15305
6 years ago
Stephane Nicoll
dfab0b4231
Upgrade to Spring Framework 5.1.3
...
Closes gh-15186
6 years ago
Stephane Nicoll
8fa8e6872c
Merge branch '2.0.x'
6 years ago
Stephane Nicoll
e89d1a8ebe
Upgrade to Spring Framework 5.0.11
...
Closes gh-15189
6 years ago
Stephane Nicoll
997209fd04
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
9bc85af19c
Upgrade to Spring Framework 4.3.21
...
Closes gh-15188
6 years ago
Stephane Nicoll
8928cd1982
Deprecate spring.rabbitmq.template.queue
...
Closes gh-15301
6 years ago
Stephane Nicoll
a240e22593
Adapt to Rabbit internal change
...
See gh-15271
6 years ago
Andy Wilkinson
cf525dabd2
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
69edf8960f
Correct stale reference to embeddedLaunchScriptProperties with Gradle
...
Closes gh-15094
6 years ago
Andy Wilkinson
de8c353cec
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
898d9f80f3
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
7cf9b984aa
Warn about unpack's use of the temporary directory
...
Closes gh-15180
6 years ago
Andy Wilkinson
fa7be63fbb
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
7ddbb37bd5
Polish
6 years ago
Andy Wilkinson
073ac7bc99
Fix Thymeleaf security dialect tests on Windows
6 years ago
Andy Wilkinson
a0d0ecf9d4
Test the Gradle plugin against Gradle 5.0
...
Closes gh-15171
6 years ago
Andy Wilkinson
5a9ff6a3cb
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
5201584c60
Upgrade to Neo4j Ogm 3.1.5
...
Closes gh-15293
6 years ago
Andy Wilkinson
55721f06df
Upgrade to Kotlin 1.2.71
...
Closes gh-15292
6 years ago
Andy Wilkinson
c73fdc4ce4
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
d2756319cb
Polish
6 years ago
Andy Wilkinson
1c4a26557c
Polish
6 years ago
Andy Wilkinson
c1bbcb6908
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
4bc32e6358
Use a HandlerInterceptor for timing long tasks
...
Closes gh-15204
6 years ago
Andy Wilkinson
e1db713169
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
958c3861ee
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
f43a83fa4f
Upgrade to Junit Jupiter 5.3.2
...
Closes gh-15286
6 years ago
Stephane Nicoll
ae1979f1ff
Merge branch '2.0.x'
6 years ago
Stephane Nicoll
5f0ac46d78
Unwrap DataSource target rather than plain instanceof calls
...
Closes gh-15227
6 years ago
Stephane Nicoll
8cdbbddc6d
Merge pull request #15206 from ttddyy
...
* pr/15206:
Polish "Perform best effort to retrieve DataSourceProxy"
Perform best effort to retrieve DataSourceProxy
6 years ago
Stephane Nicoll
e424dfbe15
Polish "Perform best effort to retrieve DataSourceProxy"
...
Closes gh-15206
6 years ago
Tadaya Tsuyukubo
26f9a92837
Perform best effort to retrieve DataSourceProxy
...
Prior to this commit, `DataSourceJmxConfiguration` with tomcat
`DataSource`, it can only find `DataSourceProxy` if the given
`DataSource` is a direct child of it. Since it uses `instanceof`, it
could not find `DataSourceProxy` if the `DataSource` is
wrapped(delegated) or proxied.
This is because `DataSourceProxy#unwrap()` always returns null; thus
cannot use this method to directly obtain `DataSourceProxy`.
In this commit, updated the check logic to perform the best effort to
retrieve `DataSourceProxy`. If given `DataSource` is wrapped or proxied
by spring, tries to unwrap or get target datasource recursively to find
`DataSourceProxy`.
See gh-15206
6 years ago
Andy Wilkinson
dff3d6ec7a
Upgrade to Jackson 2.8.11.20181123
...
Closes gh-15289
6 years ago
Andy Wilkinson
ee2107c91b
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
44632ea55c
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
1d3a066f52
Polish
6 years ago
Andy Wilkinson
548cc05bb6
Polish
6 years ago
Andy Wilkinson
5a246ce24d
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
8772f90e2f
Polish
6 years ago
Andy Wilkinson
35cce76ae8
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
3331fa2d02
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
291522a261
Avoid duplicate scope registration
...
Closes gh-14990
6 years ago
Andy Wilkinson
1797040e1a
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
a54de61e61
Polish
...
Revert change inadvertently committed as part of gh-15017
6 years ago
Andy Wilkinson
4f405ed97d
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
058428a14c
Clarify how multiple attributes are treated by ConditionalOn(Missing)Bean
...
Closes gh-15177
6 years ago
Andy Wilkinson
f25c32e8b9
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
d104205880
Update docs to reflect that @AutoConfigureRestDocs supports WebTestClient
...
Closes gh-15220
6 years ago