8987 Commits (5435f0369095d35da1e331e38f29478bf384978e)

 

All Branches   

Search

Author	SHA1	Message	Date
Stephane Nicoll	5435f03690	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	f2511cfa49	Merge pull request #7127 from herau:fix/spring-boot-docs-thymeleaf ... * pr/7127: Fix typo	8 years ago
Aurélien Leboulanger	2c64661b58	Fix typo ... Closes gh-7127	8 years ago
Stephane Nicoll	ed333a67b4	Expose Spring Data Rest RepositoryDetectionStrategy ... Closes gh-7113	8 years ago
Stephane Nicoll	d57f3afdd3	Add XA datasource for Apache Derby ... Closes gh-6823	8 years ago
Stephane Nicoll	02b0e3955c	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	4a34c35da3	Merge pull request #7120 from izeye:fix-string-format ... * pr/7120: Fix String.format() usages	8 years ago
Johnny Lim	1c4c0c6119	Fix String.format() usages ... Closes gh-7120	8 years ago
Andy Wilkinson	9b6fa1e8d7	Separate conditions that did and did not match in auto-config endpoint ... Closes gh-7122	8 years ago
Stephane Nicoll	c06dc33bf6	Generate deprecated meta-data for deprecated @Bean methods ... This commit makes sure that a meta-data group exposed via a deprecated `@Bean` method is deprecated as well. This also works if the class in which the bean method is defined is itself deprecated. Closes gh-7100	8 years ago
Andy Wilkinson	9b8f33df6d	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	20a2db79bd	Separate conditions that did and did not match in auto-config report ... Closes gh-7098	8 years ago
Stephane Nicoll	0fe0ad4cfb	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	668993c4bf	Fix typo ... Closes gh-7117	8 years ago
Stephane Nicoll	f82e91df39	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	cbb3418059	Merge pull request #7004 from master ... * pr/7004: Polish contribution Allow configuration to specify randomly generated database name	8 years ago
Stephane Nicoll	03961e6692	Polish contribution ... Closes gh-7004	8 years ago
Rob Fletcher	7fcb197092	Allow configuration to specify randomly generated database name ... See gh-7004	8 years ago
Stephane Nicoll	f684bcc9e5	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	0f97ccf2fa	Clarify dependency override instructions for Thymeleaf 3 ... Closes gh-7097	8 years ago
Stephane Nicoll	200e246238	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	e9f43f30df	Merge pull request #7111 from izeye:string-format ... * pr/7111: Remove unused parameters in String.format()	8 years ago
Johnny Lim	91254f2110	Remove unused parameters in String.format() ... Closes gh-7111	8 years ago
Andy Wilkinson	31e6819a6c	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	97cf2e9677	Polish new tests for the Gradle plugin's deprecated ID ... The output capture for the deprecation warning only appears to work when the test is run in isolation. I can't figure out why that's the case, particularly as we have another test class (BootRunResourceTests) that uses OutputCapture and works reliably. I'm cutting my loses and removing the use of OutputCapture and the assertion that the warnings is logged. See gh-6997	8 years ago
Andy Wilkinson	fe10ea73b0	Merge branch '1.4.x' into 1.5.x	8 years ago
Andy Wilkinson	ad3e5c04bb	Add a second, portal-compatible ID to the Gradle plugin ... To be compatible with Gradle's plugin portal, plugins must have an ID that uses a reverse domain name. This means that spring-boot is not compatible. This commit introduces a new ID, org.springframework.boot, and deprecates the old ID. Closes gh-6997	8 years ago
Stephane Nicoll	cf28663cd7	Deprecate commons-dbcp 1 ... Closes gh-6787	8 years ago
Stephane Nicoll	0b9283c3cd	Merge pull request #6367 from henrikerola:gh-6351 ... * pr/6367: Polish contribution "spring war" should copy resources to WEB-INF/classes	8 years ago
Stephane Nicoll	2d75cc79c0	Polish contribution ... Closes gh-6367	8 years ago
Henri Kerola	d07f689446	"spring war" should copy resources to WEB-INF/classes ... Closes gh-6351	8 years ago
Stephane Nicoll	07690bab25	Allow customization of the auto-configured JmsTemplate ... Closes gh-6825	8 years ago
Stephane Nicoll	4b2970606e	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	7019894f0e	Clarify the role of spring-boot-starter-cache ... The cache abstraction is a core feature of the Spring Framework. Basic features such as `@EnableCaching` are therefore available by default with no extra dependencies necessary. However, the actual cache adapters for JCache, Ehcache 2.x, Caffeine and Guava are located in a separated module, `spring-context-support`. Spring Boot provides that artifact via the `spring-boot-starter-cache` starter. It is quite easy to "only" add the cache library dependencies and forget about this extra dependencies since `@EnableCaching` is available by default. This commit clarifies the role of the starer in each section so that it is more obvious. We're already explaining this at the beginning of the section but it seems that's not enough. Closes gh-7071	8 years ago
Stephane Nicoll	d0e49cc413	Merge branch '1.4.x' into 1.5.x	8 years ago
Stephane Nicoll	8d2aedc5a8	Merge branch '1.3.x' into 1.4.x	8 years ago
Stephane Nicoll	7f1118b87a	Merge pull request #7073 from garyrussell:si4210 ... * pr/7073: Upgrade to Spring Integration 4.2.11	8 years ago
Gary Russell	0ffc7dc13f	Upgrade to Spring Integration 4.2.11 ... Closes gh-7073	8 years ago
Stephane Nicoll	58050fb72f	Merge branch '1.4.x' into 1.5.x ... # Conflicts: # spring-boot-dependencies/pom.xml	8 years ago
Stephane Nicoll	dcb3f31901	Merge pull request #7074 from garyrussell:si433-14 ... * pr/7074: Upgrade to Spring Integration 4.3.4, AMQP 1.6.3	8 years ago
Gary Russell	ad3179b9ee	Upgrade to Spring Integration 4.3.4, AMQP 1.6.3 ... Closes gh-7074	8 years ago
Stephane Nicoll	dfb3675937	Merge pull request #7085 from dstine:docs-typos ... * pr/7085: Fix a typo	8 years ago
Dan Stine	0926b66123	Fix a typo ... Closes gh-7085	8 years ago
Phillip Webb	8fe755d281	Fixup parent POM version	8 years ago
Phillip Webb	6d11931421	Merge branch '1.4.x' into 1.5.x	8 years ago
Phillip Webb	bd341cbac8	Polish	8 years ago
Phillip Webb	a2315378d4	Formatting	8 years ago
Phillip Webb	f2b0fa284e	Merge branch '1.4.x' into 1.5.x	8 years ago
Phillip Webb	cdeed8e934	Merge pull request #7089 from mbhave/gh-7065 ... * pr/7089: Fix NoClassDefFoundError when Mockito is missing	8 years ago
Madhura Bhave	16fe332f51	Fix NoClassDefFoundError when Mockito is missing ... Update MockReset class to check for the presence of the MockUtil class before attempting to use it. Fixes gh-7065	8 years ago