f43a83fa4f
Upgrade to Junit Jupiter 5.3.2
...
Closes gh-15286
6 years ago
ae1979f1ff
Merge branch '2.0.x'
6 years ago
5f0ac46d78
Unwrap DataSource target rather than plain instanceof calls
...
Closes gh-15227
6 years ago
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
e424dfbe15
Polish "Perform best effort to retrieve DataSourceProxy"
...
Closes gh-15206
6 years ago
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
ee2107c91b
Merge branch '2.0.x'
6 years ago
44632ea55c
Merge branch '1.5.x' into 2.0.x
6 years ago
1d3a066f52
Polish
6 years ago
548cc05bb6
Polish
6 years ago
5a246ce24d
Merge branch '2.0.x'
6 years ago
8772f90e2f
Polish
6 years ago
35cce76ae8
Merge branch '2.0.x'
6 years ago
3331fa2d02
Merge branch '1.5.x' into 2.0.x
6 years ago
291522a261
Avoid duplicate scope registration
...
Closes gh-14990
6 years ago
1797040e1a
Merge branch '2.0.x'
6 years ago
a54de61e61
Polish
...
Revert change inadvertently committed as part of gh-15017
6 years ago
4f405ed97d
Merge branch '2.0.x'
6 years ago
058428a14c
Clarify how multiple attributes are treated by ConditionalOn(Missing)Bean
...
Closes gh-15177
6 years ago
f25c32e8b9
Merge branch '2.0.x'
6 years ago
d104205880
Update docs to reflect that @AutoConfigureRestDocs supports WebTestClient
...
Closes gh-15220
6 years ago
deeb961c6e
Merge branch '2.0.x'
6 years ago
1f39b5dd7a
Align MeterRegistryConfigurer's javadoc with its implementation
...
Closes gh-15017
6 years ago
56519e5cbb
Merge branch '2.0.x'
6 years ago
8ee57ac574
Remove redundant suggestion to add a dependency on Woodstox
...
It's now a transitive dependency of jackson-dataformat-xml so there is no
need to depend on it explicitly.
Closes gh-15092
6 years ago
7790876575
Merge branch '2.0.x'
6 years ago
c0e286b96b
Test the Gradle Plugin against Gradle 5.0-rc-3
...
Closes gh-15171
6 years ago
ce0a3d0311
Add missing classpath setters to BootJar and BootWar
...
Closes gh-15087
6 years ago
d97ce26830
Merge branch '2.0.x'
6 years ago
fd6dea7ac8
Merge branch '1.5.x' into 2.0.x
6 years ago
85cb6bf096
Revert "Upgrade to Ehcache 2.10.6"
...
This reverts commit addc421bfd
6 years ago
687fdf9a1a
Merge branch '2.0.x'
6 years ago
3bda78a3d3
Fix tests after HandlerExceptionResolver logging changes
...
See gh-14936 and gh-15189
6 years ago
b5433cd862
Revert "Upgrade to Selenium Htmlunit 2.33.3"
...
This reverts commit 3048b7a218
6 years ago
27ef03a2c1
Merge branch '2.0.x'
6 years ago
97f7984812
Merge branch '1.5.x' into 2.0.x
6 years ago
2aa2091fc4
Revert "Upgrade to Jetty 9.4.14.v20181114"
...
This reverts commit d4b914828f
6 years ago
ee8aca77eb
Start building against Spring Session Bean-SR1 snapshots
...
See gh-15275
6 years ago
fc6df83f56
Start building against Spring Security 5.1.2 snapshots
...
See gh-15274
6 years ago
449b40f6fc
Start building against Spring Kafka 2.2.1 snapshots
...
See gh-15273
6 years ago
848121288c
Start building against Spring Integration 5.1.1 snapshots
...
See gh-15272
6 years ago
3d4838c055
Start building against Spring AMQP 2.1.2 snapshots
...
See gh-15271
6 years ago
df918bae5d
Upgrade to Maven Shade Plugin 3.2.1
...
Closes gh-15270
6 years ago
3048b7a218
Upgrade to Selenium Htmlunit 2.33.3
...
Closes gh-15269
6 years ago
a2ff9b7d35
Upgrade to Lombok 1.18.4
...
Closes gh-15268
6 years ago
b73cf9f738
Upgrade to Mockito 2.23.4
...
Closes gh-15267
6 years ago
1a8ac57a2f
Upgrade to Jooq 3.11.7
...
Closes gh-15266
6 years ago
88bec38961
Upgrade to Infinispan 9.4.2.Final
...
Closes gh-15265
6 years ago
58750624bc
Upgrade to Elasticsearch 6.4.3
...
Closes gh-15264
6 years ago
fa4de5eb78
Upgrade to Ehcache3 3.6.2
...
Closes gh-15263
6 years ago
Stephane Nicoll
Tadaya Tsuyukubo
Andy Wilkinson