Commit Graph

9061 Commits (5dfe801fd737559ec6f294afa86e86515e4fd0a8)
 

Author SHA1 Message Date
Andy Wilkinson 5dfe801fd7 Merge branch '1.5.x' 8 years ago
Andy Wilkinson d2d911ba94 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson a5b4c8e6db Make cycle clearer in bean currently in creation failure analysis
Note: the fully-qualified references to @Configuration in some of the
test configuration classes are required to work around a bug in javac.
1.8.0_102 (and earlier). Without them, compilation fails as it cannot
resolve the symbol despite the import statement and the unqualified
references working elsewhere in the same source file.

Closes gh-7056
8 years ago
Stephane Nicoll 0480a96166 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 98b30416ca Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 9861cb7e9c Expand the note regarding LiveReload
See gh-7080
8 years ago
Stephane Nicoll 3a86e26977 Merge branch '1.5.x' 8 years ago
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 5a2eae5628 Merge branch '1.5.x' 8 years ago
Stephane Nicoll ed333a67b4 Expose Spring Data Rest RepositoryDetectionStrategy
Closes gh-7113
8 years ago
Stephane Nicoll 502daf06ab Merge branch '1.5.x' 8 years ago
Stephane Nicoll d57f3afdd3 Add XA datasource for Apache Derby
Closes gh-6823
8 years ago
Stephane Nicoll 640a77fcfa Merge branch '1.5.x' 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 cf038da083 Merge branch '1.5.x' 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 daaa545d69 Merge branch '1.5.x' 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 c465fcefad Merge branch '1.5.x' 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 7474b53020 Add reference to RestFB Messenger 8 years ago
Stephane Nicoll f6f07dd426 Merge branch '1.5.x' 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 b54566c0cd Merge branch '1.5.x' 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 89b1ff1fac Merge branch '1.5.x' 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 2ff41ce9cc Merge branch '1.5.x' 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 59ce40edbc Merge branch '1.5.x' 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 4b3b293691 Merge branch '1.5.x' 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
Andy Wilkinson f137ec6a3a Merge branch '1.5.x' 8 years ago
Andy Wilkinson 846f264da8 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 77f1da871f 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