fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,896 Commits 22 Branches 339 Tags
Commit Graph

1979 Commits

Author SHA1 Message Date
Stephane Nicoll
eeed3a841c Review configuration properties appendix 2017-04-12 16:03:35 +02:00
Stephane Nicoll
abe3dba4b9 Merge branch '1.5.x' 2017-04-12 11:46:59 +02:00
Stephane Nicoll
f4ab574ea1 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:46:43 +02:00
Stephane Nicoll
072160863a Add a note about transactional tests and webEnvironment 
Closes gh-8232
 2017-04-12 11:46:06 +02:00
Stephane Nicoll
01089c5f7a Merge branch '1.5.x' 2017-04-12 11:16:10 +02:00
Stephane Nicoll
68c90b24c2 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:15:51 +02:00
Stephane Nicoll
40f4c89602 Document list merge restrictions with YAML 
Closes gh-6911
 2017-04-12 11:15:24 +02:00
Phillip Webb
c4cba6b0ea Merge branch '1.5.x' 2017-04-11 21:07:51 -07:00
Phillip Webb
d301d0f4c3 Merge branch '1.4.x' into 1.5.x 2017-04-11 20:42:48 -07:00
Phillip Webb
758ddcd420 Polish 2017-04-11 20:17:23 -07:00
Stephane Nicoll
158b3dae16 Merge branch '1.5.x' 2017-04-11 14:57:19 +02:00
Stephane Nicoll
2ef318c00d Polish "Add the ability to disable the trace filter" 
Closes gh-8650
 2017-04-11 14:46:57 +02:00
Johnny Lim
0cd1285aa4 Polish 
Closes gh-8879
 2017-04-11 09:41:33 +02:00
Stephane Nicoll
5b92a0278b Merge branch '1.5.x' 2017-04-11 09:41:08 +02:00
Stephane Nicoll
3f883f1898 Merge branch '1.4.x' into 1.5.x 2017-04-11 09:38:11 +02:00
Stephane Nicoll
404bb2d171 Polish 
See gh-8879
 2017-04-11 09:37:22 +02:00
Stephane Nicoll
2bdbe343df Merge branch '1.5.x' 2017-04-10 16:14:13 +02:00
Stephane Nicoll
a132bd141f Merge branch '1.4.x' into 1.5.x 2017-04-10 16:13:53 +02:00
Stephane Nicoll
0a55e3e736 Polish "Clarify edge case docs on ConditionalOnClass" 
Closes gh-8185
 2017-04-10 16:12:11 +02:00
Phillip Verheyden
08f8219248 Clarify edge case docs on ConditionalOnClass 
When used as a meta-annotation the value() attribute of
@ConditionalOnClass will fail silently resulting in the @Conditional
nature of the annotation being ignored.

See gh-8185
 2017-04-10 15:58:17 +02:00
Stephane Nicoll
b099471df3 Merge branch '1.5.x' 2017-04-10 15:54:53 +02:00
Stephane Nicoll
2d930fd653 Merge branch '1.4.x' into 1.5.x 2017-04-10 15:54:34 +02:00
Stephane Nicoll
a8860ba7e9 Clarify use of @TestConfiguration 
As `@TestComponent` is an implementation detail at this point really, this
commit removes any reference to it from the doc.

Closes gh-8421
 2017-04-10 15:54:08 +02:00
Stephane Nicoll
b3bcecc988 Merge branch '1.5.x' 2017-04-10 14:04:11 +02:00
Stephane Nicoll
d8d36255af Merge branch '1.4.x' into 1.5.x 2017-04-10 14:02:51 +02:00
Stephane Nicoll
fd53945fe0 Polish "Document HTTP response format of health endpoint" 
Closes gh-8703
 2017-04-10 14:01:50 +02:00
Luis Fernando Pollo
1fa1ed2b28 Document HTTP response format of health endpoint 
Add HTTP response format details for health endpoint, including default
status codes and sample responses.

See gh-8703
 2017-04-10 13:51:07 +02:00
Stephane Nicoll
2d169d526a Merge branch '1.5.x' 2017-04-07 10:05:40 +02:00
Stephane Nicoll
fffb53ccf5 Fix neo4j embedded documentation 
The neo4j embedded driver no longer embeds the neo4j kernel and users are
expected to add that dependency manually. We don't provide dependency
management for any of them so this commit updates the documentation to
refers to the official documentation.

Closes gh-8567
 2017-04-07 10:04:41 +02:00
Johnny Lim
8d921d49aa Fix typos in new Gradle plugin 
Closes gh-8818
 2017-04-05 12:29:52 +01:00
Phillip Webb
2de7e9c310 Merge branch '1.5.x' 2017-04-04 10:07:38 -07:00
Phillip Webb
ad38776de3 Polish 2017-04-04 09:48:10 -07:00
Phillip Webb
ddcb5ee328 Polish 2017-04-04 09:36:27 -07:00
Andy Wilkinson
395db8711c Merge branch '1.5.x' 2017-04-04 17:03:13 +01:00
Andy Wilkinson
df6167dd71 Merge branch '1.4.x' into 1.5.x 2017-04-04 17:02:58 +01:00
Andy Wilkinson
9374020b0e Stop -> from being replaced with → as the latter renders as # in PDF 
Closes gh-8575
 2017-04-04 17:00:16 +01:00
Andy Wilkinson
01166381a0 Provide separate documentation (API and reference) for Gradle plugin 2017-04-04 15:33:27 +01:00
Stephane Nicoll
78845fe63a Switch default value of spring.aop.proxy-target-class 
This commit ensures that the default proxying value matches the opinion we
have applied for `@EnableTransactionManagement`

Closes gh-8786
 2017-04-04 17:27:00 +03:00
Stephane Nicoll
b08016f15a Polish "Add @DataNeo4jTest" contribution 
Closes gh-8618
 2017-04-02 12:38:24 +02:00
Johnny Lim
1ed5108639 Update doc for add-application-context-header 
Closes gh-8791
 2017-04-01 11:27:42 +02:00
Stephane Nicoll
ff50331168 Merge branch '1.5.x' 2017-03-28 10:27:31 +02:00
Stephane Nicoll
d8e90af3bf Merge branch '1.4.x' into 1.5.x 2017-03-28 10:27:14 +02:00
Dániel Zelei
cc30adf0df Fix propdeps-plugin url in doc 
Closes gh-8678
 2017-03-28 10:15:43 +02:00
Stephane Nicoll
ee0a151671 Merge branch '1.5.x' 2017-03-28 10:05:47 +02:00
Stephane Nicoll
49b8d8c482 Polish 
See gh-8698
 2017-03-28 10:05:33 +02:00
Andy Wilkinson
d322d8613b Upgrade to Flyway 4.1.2 
Closes gh-8752
 2017-03-25 20:41:43 +00:00
Kazuki Shimizu
bbde6de95b Fix syntax in doc 
Closes gh-8688
 2017-03-25 14:29:50 +00:00
Andy Wilkinson
2fd51dd8a1 Upgrade to Spring REST Docs 1.2.0.RC1 
Closes gh-8716
 2017-03-24 21:12:21 +00:00
Madhura Bhave
30eae8a47d Merge branch '1.5.x' 2017-03-23 16:14:32 -07:00
Madhura Bhave
aa25bfb0e0 Clarify the effect that management.context-path has on endpoint paths 
Fixes gh-8586
 2017-03-23 16:12:48 -07:00