Commit Graph

17733 Commits (cfbd56cb736061b5274eb8de843bd9e1f092b805)
 

Author SHA1 Message Date
Stephane Nicoll 9bc85af19c Upgrade to Spring Framework 4.3.21
Closes gh-15188
6 years ago
Andy Wilkinson 69edf8960f Correct stale reference to embeddedLaunchScriptProperties with Gradle
Closes gh-15094
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 7ddbb37bd5 Polish 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 d2756319cb Polish 6 years ago
Andy Wilkinson 4bc32e6358 Use a HandlerInterceptor for timing long tasks
Closes gh-15204
6 years ago
Andy Wilkinson 958c3861ee Merge branch '1.5.x' into 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 44632ea55c Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 1d3a066f52 Polish 6 years ago
Andy Wilkinson 8772f90e2f Polish 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 a54de61e61 Polish
Revert change inadvertently committed as part of gh-15017
6 years ago
Andy Wilkinson 058428a14c Clarify how multiple attributes are treated by ConditionalOn(Missing)Bean
Closes gh-15177
6 years ago
Andy Wilkinson d104205880 Update docs to reflect that @AutoConfigureRestDocs supports WebTestClient
Closes gh-15220
6 years ago
Andy Wilkinson 1f39b5dd7a Align MeterRegistryConfigurer's javadoc with its implementation
Closes gh-15017
6 years ago
Andy Wilkinson 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
Andy Wilkinson ce0a3d0311 Add missing classpath setters to BootJar and BootWar
Closes gh-15087
6 years ago
Andy Wilkinson fd6dea7ac8 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 85cb6bf096 Revert "Upgrade to Ehcache 2.10.6"
This reverts commit addc421bfd.

Closes gh-15237
6 years ago
Andy Wilkinson 3bda78a3d3 Fix tests after HandlerExceptionResolver logging changes
See gh-14936 and gh-15189
6 years ago
Andy Wilkinson 97f7984812 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 2aa2091fc4 Revert "Upgrade to Jetty 9.4.14.v20181114"
This reverts commit d4b914828f.
See gh-15239
6 years ago
Andy Wilkinson 9ca96cb751 Start building against Spring Framework 5.1.1 snapshots
See gh-15189
6 years ago
Andy Wilkinson 39bec2c50f Start building against Spring Integration 5.0.10 snapshots
See gh-15251
6 years ago
Andy Wilkinson 00f1e92350 Start building against Spring Session Apple-SR7 snapshots
See gh-15254
6 years ago
Andy Wilkinson 739de913d5 Start building against Spring AMQP 2.0.10 snapshots
See gh-15256
6 years ago
Andy Wilkinson de84a51f26 Upgrade to Spring Cloud Connectors 2.0.4.RELEASE
Closes gh-15250
6 years ago
Andy Wilkinson ff22df0475 Upgrade to Jetty El 8.5.33.1
Closes gh-15249
6 years ago
Andy Wilkinson d08edf7e14 Upgrade to Elasticsearch 5.6.13
Closes gh-15248
6 years ago
Andy Wilkinson 350e397d53 Upgrade to Janino 3.0.11
Closes gh-15247
6 years ago
Andy Wilkinson ec219b30d2 Upgrade to Activemq 5.15.8
Closes gh-15246
6 years ago
Andy Wilkinson 941d8744cb Upgrade to Javax Json 1.1.4
Closes gh-15245
6 years ago
Andy Wilkinson 6761747e39 Upgrade to Reactor Bom Bismuth-SR14
Closes gh-15244
6 years ago
Andy Wilkinson 40005c0e59 Upgrade to Unboundid Ldapsdk 4.0.9
Closes gh-15243
6 years ago
Andy Wilkinson ba4461a7a2 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 992d7dc24b Upgrade to Spring Session 1.3.4.RELEASE
Closes gh-15242
6 years ago
Andy Wilkinson e72bae5390 Upgrade to Spring Integration 4.3.18.RELEASE
Closes gh-15241
6 years ago
Andy Wilkinson 105d7e336d Upgrade to Spring Cloud Connectors 1.2.7.RELEASE
Closes gh-15240
6 years ago
Andy Wilkinson d4b914828f Upgrade to Jetty 9.4.14.v20181114
Closes gh-15239
6 years ago
Andy Wilkinson b1853ee4e0 Upgrade to Tomcat 8.5.35
Closes gh-15238
6 years ago
Andy Wilkinson addc421bfd Upgrade to Ehcache 2.10.6
Closes gh-15237
6 years ago