Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,613 Commits 23 Branches 0 Tags
38d96aabef94debe6ae5647802e61b9510d88a67
Commit Graph

50613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
3e1425ebed Polish contribution 
Closes gh-6543
 2016-10-10 10:43:12 +02:00
Vedran Pavic
286a928347 Improve database initializers 
This commit improves database initializers for Spring Batch and Spring
Session by introducing `AbstractDatabaseInitializer` which eliminates
duplicated logic in existing initializers. Additionally, database
platform resolution now relies on `DatabaseDriver`.

See gh-6543
 2016-10-10 09:53:40 +02:00
Andy Wilkinson
5dfe801fd7 Merge branch '1.5.x' 2016-10-07 17:08:30 +01:00
Andy Wilkinson
d2d911ba94 Merge branch '1.4.x' into 1.5.x 2016-10-07 17:08:20 +01:00
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
 2016-10-07 17:07:44 +01:00
Stephane Nicoll
0480a96166 Merge branch '1.5.x' 2016-10-07 14:21:40 +02:00
Stephane Nicoll
98b30416ca Merge branch '1.4.x' into 1.5.x 2016-10-07 14:21:28 +02:00
Stephane Nicoll
9861cb7e9c Expand the note regarding LiveReload 
See gh-7080
 2016-10-07 14:21:12 +02:00
Stephane Nicoll
3a86e26977 Merge branch '1.5.x' 2016-10-07 14:15:31 +02:00
Stephane Nicoll
5435f03690 Merge branch '1.4.x' into 1.5.x 2016-10-07 14:15:19 +02:00
Stephane Nicoll
f2511cfa49 Merge pull request #7127 from herau:fix/spring-boot-docs-thymeleaf 
* pr/7127:
  Fix typo
 2016-10-07 14:15:04 +02:00
Aurélien Leboulanger
2c64661b58 Fix typo 
Closes gh-7127
 2016-10-07 14:14:50 +02:00
Stephane Nicoll
5a2eae5628 Merge branch '1.5.x' 2016-10-07 10:35:59 +02:00
Stephane Nicoll
ed333a67b4 Expose Spring Data Rest RepositoryDetectionStrategy 
Closes gh-7113
 2016-10-07 10:35:48 +02:00
Stephane Nicoll
502daf06ab Merge branch '1.5.x' 2016-10-07 10:23:27 +02:00
Stephane Nicoll
d57f3afdd3 Add XA datasource for Apache Derby 
Closes gh-6823
 2016-10-07 10:23:13 +02:00
Stephane Nicoll
640a77fcfa Merge branch '1.5.x' 2016-10-07 09:46:39 +02:00
Stephane Nicoll
02b0e3955c Merge branch '1.4.x' into 1.5.x 2016-10-07 09:46:21 +02:00
Stephane Nicoll
4a34c35da3 Merge pull request #7120 from izeye:fix-string-format 
* pr/7120:
  Fix String.format() usages
 2016-10-07 09:46:03 +02:00
Johnny Lim
1c4c0c6119 Fix String.format() usages 
Closes gh-7120
 2016-10-07 09:45:43 +02:00
Andy Wilkinson
cf038da083 Merge branch '1.5.x' 2016-10-06 17:15:46 +01:00
Andy Wilkinson
9b6fa1e8d7 Separate conditions that did and did not match in auto-config endpoint 
Closes gh-7122
 2016-10-06 17:15:38 +01:00
Stephane Nicoll
daaa545d69 Merge branch '1.5.x' 2016-10-06 17:09:24 +02:00
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
 2016-10-06 17:08:49 +02:00
Andy Wilkinson
c465fcefad Merge branch '1.5.x' 2016-10-06 15:53:19 +01:00
Andy Wilkinson
9b8f33df6d Merge branch '1.4.x' into 1.5.x 2016-10-06 15:53:07 +01:00
Andy Wilkinson
20a2db79bd Separate conditions that did and did not match in auto-config report 
Closes gh-7098
 2016-10-06 15:52:45 +01:00
Stephane Nicoll
7474b53020 Add reference to RestFB Messenger 2016-10-06 15:15:40 +02:00
Stephane Nicoll
f6f07dd426 Merge branch '1.5.x' 2016-10-06 13:35:44 +02:00
Stephane Nicoll
0fe0ad4cfb Merge branch '1.4.x' into 1.5.x 2016-10-06 13:35:32 +02:00
Stephane Nicoll
668993c4bf Fix typo 
Closes gh-7117
 2016-10-06 13:35:21 +02:00
Stephane Nicoll
b54566c0cd Merge branch '1.5.x' 2016-10-06 13:30:14 +02:00
Stephane Nicoll
f82e91df39 Merge branch '1.4.x' into 1.5.x 2016-10-06 13:29:53 +02:00
Stephane Nicoll
cbb3418059 Merge pull request #7004 from master 
* pr/7004:
  Polish contribution
  Allow configuration to specify randomly generated database name
 2016-10-06 13:29:38 +02:00
Stephane Nicoll
03961e6692 Polish contribution 
Closes gh-7004
 2016-10-06 13:28:23 +02:00
Rob Fletcher
7fcb197092 Allow configuration to specify randomly generated database name 
See gh-7004
 2016-10-06 11:40:19 +02:00
Stephane Nicoll
89b1ff1fac Merge branch '1.5.x' 2016-10-06 11:37:35 +02:00
Stephane Nicoll
f684bcc9e5 Merge branch '1.4.x' into 1.5.x 2016-10-06 11:37:20 +02:00
Stephane Nicoll
0f97ccf2fa Clarify dependency override instructions for Thymeleaf 3 
Closes gh-7097
 2016-10-06 11:21:24 +02:00
Stephane Nicoll
2ff41ce9cc Merge branch '1.5.x' 2016-10-06 09:35:15 +02:00
Stephane Nicoll
200e246238 Merge branch '1.4.x' into 1.5.x 2016-10-06 09:35:01 +02:00
Stephane Nicoll
e9f43f30df Merge pull request #7111 from izeye:string-format 
* pr/7111:
  Remove unused parameters in String.format()
 2016-10-06 09:34:45 +02:00
Johnny Lim
91254f2110 Remove unused parameters in String.format() 
Closes gh-7111
 2016-10-06 09:34:32 +02:00
Andy Wilkinson
59ce40edbc Merge branch '1.5.x' 2016-10-05 17:03:37 +01:00
Andy Wilkinson
31e6819a6c Merge branch '1.4.x' into 1.5.x 2016-10-05 17:03:27 +01:00
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
 2016-10-05 16:54:37 +01:00
Andy Wilkinson
4b3b293691 Merge branch '1.5.x' 2016-10-05 14:59:20 +01:00
Andy Wilkinson
fe10ea73b0 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:58:42 +01:00
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
 2016-10-05 14:58:26 +01:00
Andy Wilkinson
f137ec6a3a Merge branch '1.5.x' 2016-10-05 14:58:02 +01:00