spring-boot

Commit Graph

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

1 2 3 4 5 ...

19494 Commits (ae1979f1ffa67c043f945f865ae3b846322db802) All Branches Search

19494 Commits (ae1979f1ffa67c043f945f865ae3b846322db802)

All Branches