42c1eb894e
Merge branch '1.5.x'
2017-04-14 13:58:03 +02:00
8c21e16cf1
Add reference to Infinispan starter
...
Closes gh-8592
2017-04-14 13:57:47 +02:00
04ee374e7f
Polish "Add slice test annotation for LDAP"
...
Closes gh-8536
2017-04-14 10:51:43 +02:00
2830bef95c
Add slice test annotation for LDAP
...
This commit adds new annotation `@DataLdapTest` which provides test
infrastructure for LDAP. By default, embedded ldap server is initialized
if available.
See gh-8536
2017-04-14 10:39:03 +02:00
50331102b7
Review configuration properties appendix
2017-04-13 10:36:41 +02:00
8cd4f13464
Merge branch '1.5.x'
2017-04-13 10:25:14 +02:00
b3c8511fb6
Merge branch '1.4.x' into 1.5.x
2017-04-13 10:24:07 +02:00
4fd9a8c468
Add missing spring.datasource.xa properties in the appendix
...
Closes gh-8895
2017-04-13 10:23:44 +02:00
e9b7c7afd2
Merge branch '1.5.x'
2017-04-12 16:17:58 +02:00
584b61ecc1
Remove deprecated property
2017-04-12 16:16:19 +02:00
eeed3a841c
Review configuration properties appendix
2017-04-12 16:03:35 +02:00
abe3dba4b9
Merge branch '1.5.x'
2017-04-12 11:46:59 +02:00
f4ab574ea1
Merge branch '1.4.x' into 1.5.x
2017-04-12 11:46:43 +02:00
072160863a
Add a note about transactional tests and `webEnvironment`
...
Closes gh-8232
2017-04-12 11:46:06 +02:00
01089c5f7a
Merge branch '1.5.x'
2017-04-12 11:16:10 +02:00
68c90b24c2
Merge branch '1.4.x' into 1.5.x
2017-04-12 11:15:51 +02:00
40f4c89602
Document list merge restrictions with YAML
...
Closes gh-6911
2017-04-12 11:15:24 +02:00
c4cba6b0ea
Merge branch '1.5.x'
2017-04-11 21:07:51 -07:00
d301d0f4c3
Merge branch '1.4.x' into 1.5.x
2017-04-11 20:42:48 -07:00
758ddcd420
Polish
2017-04-11 20:17:23 -07:00
158b3dae16
Merge branch '1.5.x'
2017-04-11 14:57:19 +02:00
2ef318c00d
Polish "Add the ability to disable the trace filter"
...
Closes gh-8650
2017-04-11 14:46:57 +02:00
0cd1285aa4
Polish
...
Closes gh-8879
2017-04-11 09:41:33 +02:00
5b92a0278b
Merge branch '1.5.x'
2017-04-11 09:41:08 +02:00
3f883f1898
Merge branch '1.4.x' into 1.5.x
2017-04-11 09:38:11 +02:00
404bb2d171
Polish
...
See gh-8879
2017-04-11 09:37:22 +02:00
2bdbe343df
Merge branch '1.5.x'
2017-04-10 16:14:13 +02:00
a132bd141f
Merge branch '1.4.x' into 1.5.x
2017-04-10 16:13:53 +02:00
0a55e3e736
Polish "Clarify edge case docs on ConditionalOnClass"
...
Closes gh-8185
2017-04-10 16:12:11 +02:00
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
b099471df3
Merge branch '1.5.x'
2017-04-10 15:54:53 +02:00
2d930fd653
Merge branch '1.4.x' into 1.5.x
2017-04-10 15:54:34 +02:00
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
b3bcecc988
Merge branch '1.5.x'
2017-04-10 14:04:11 +02:00
d8d36255af
Merge branch '1.4.x' into 1.5.x
2017-04-10 14:02:51 +02:00
fd53945fe0
Polish "Document HTTP response format of health endpoint"
...
Closes gh-8703
2017-04-10 14:01:50 +02:00
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
2d169d526a
Merge branch '1.5.x'
2017-04-07 10:05:40 +02:00
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
8d921d49aa
Fix typos in new Gradle plugin
...
Closes gh-8818
2017-04-05 12:29:52 +01:00
2de7e9c310
Merge branch '1.5.x'
2017-04-04 10:07:38 -07:00
ad38776de3
Polish
2017-04-04 09:48:10 -07:00
ddcb5ee328
Polish
2017-04-04 09:36:27 -07:00
395db8711c
Merge branch '1.5.x'
2017-04-04 17:03:13 +01:00
df6167dd71
Merge branch '1.4.x' into 1.5.x
2017-04-04 17:02:58 +01:00
9374020b0e
Stop -> from being replaced with → as the latter renders as # in PDF
...
Closes gh-8575
2017-04-04 17:00:16 +01:00
01166381a0
Provide separate documentation (API and reference) for Gradle plugin
2017-04-04 15:33:27 +01:00
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
b08016f15a
Polish "Add @DataNeo4jTest" contribution
...
Closes gh-8618
2017-04-02 12:38:24 +02:00
1ed5108639
Update doc for add-application-context-header
...
Closes gh-8791
2017-04-01 11:27:42 +02:00
Stephane Nicoll
Eddú Meléndez
Phillip Webb
Johnny Lim
Phillip Verheyden
Luis Fernando Pollo
Andy Wilkinson