Stephane Nicoll
2ef318c00d
Polish "Add the ability to disable the trace filter"
...
Closes gh-8650
2017-04-11 14:46:57 +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
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
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
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
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
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
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
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
49b8d8c482
Polish
...
See gh-8698
2017-03-28 10:05:33 +02: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
Madhura Bhave
cb38546d8a
Document default trace includes
...
Closes gh-8654
2017-03-23 15:36:27 -07:00
Sola
ddd8d03a2a
Fix typo in doc
...
Closes gh-8658
2017-03-18 07:39:16 +01:00
Stephane Nicoll
84dea5264f
Merge branch '1.4.x' into 1.5.x
2017-03-17 09:57:52 +01:00
Stephane Nicoll
0ca07fbdc3
Polish contribution
...
Closes gh-8594
2017-03-17 09:56:45 +01:00
lexandro
36b28540ee
Fix invalid security example in doc
...
Closes gh-8580
2017-03-17 09:51:08 +01:00
Stephane Nicoll
cc79f6d83d
Merge branch '1.4.x' into 1.5.x
2017-03-15 14:52:19 +01:00
Stephane Nicoll
f72e0c08df
Add a note to ActiveMQ pooling in the doc
...
Closes gh-8598
2017-03-15 14:51:55 +01:00
Stephane Nicoll
cd8684499d
Polish
...
See gh-8621
2017-03-15 08:57:24 +01:00
Stephane Nicoll
6be2cc30d3
Merge branch '1.4.x' into 1.5.x
2017-03-15 08:54:21 +01:00
Stephane Nicoll
bc157d5b4f
Polish
...
See gh-8621
2017-03-15 08:50:50 +01:00
Stephane Nicoll
6a137260c1
Merge branch '1.4.x' into 1.5.x
2017-03-12 08:44:18 +01:00
Stephane Nicoll
4158a6d50f
Fix typo
...
Closes gh-8574
2017-03-12 08:43:51 +01:00
Stephane Nicoll
f8bf05b91f
Polish contribution
...
Closes gh-8474
2017-03-10 10:20:48 +01:00
srichard
0ddaca57fb
Add Tomcat Access Log's fileDateFormat property
...
Closes gh-8396
2017-03-10 09:57:00 +01:00
Stephane Nicoll
feb1ab375f
Merge branch '1.4.x' into 1.5.x
2017-03-10 09:36:55 +01:00
Eddú Meléndez
251090b1e5
Add missing spring-data-cassandra metadata
...
This commit adds the missing
`spring.data.cassandra.repositories.enabled` in the metadata and the
documentation.
Closes gh-8562
2017-03-10 09:34:19 +01:00
Stephane Nicoll
544c73841d
Merge branch '1.4.x' into 1.5.x
2017-03-10 09:22:32 +01:00
Stephane Nicoll
633e75dce2
Fix typo
...
Closes gh-8563
2017-03-10 09:22:00 +01:00
Stephane Nicoll
207ab3ecb4
Merge branch '1.4.x' into 1.5.x
2017-03-09 18:21:40 +01:00
Stephane Nicoll
07c56c60ba
Make sure Hazelcast bootstraps before any JCache setup
...
This commit makes sure that if a `javax.cache.CacheManager` is required,
an auto-configured `HazelcastInstance` is fully resolved first. This
prevents the case where the JCache bootstrap actually starts an instance
early, followed by a second (potentially unwanted) instance created by the
regular auto-configuration.
Since the JCache implementation works with an `HazelcastInstance` behind
the scenes, if there is one `HazelcastInstance` configured and it has a
name, then we configure the `CacheProvider` to use that. Future Hazelcast
version will allow to pass the instance directly (i.e. not requiring an
actual name).
Closes gh-8484
2017-03-09 17:59:20 +01:00
Spring Buildmaster
d23fa24340
Next Development Version
2017-03-03 16:18:26 +00:00
Spring Buildmaster
2a83e80a9b
Next Development Version
2017-03-03 14:39:21 +00:00
Stephane Nicoll
bb8800a625
Deprecate spring.cache.hazelcast.config
...
The additional configuration for an `HazelcastInstance` will be removed
in 2.0. This commit makes sure that the property is deprecated in 1.5
See gh-8470
2017-03-03 10:30:06 +01:00
Andy Wilkinson
6673d8eebc
Polish "Allow loader.path to refer to nested jars"
...
Closes gh-8334
Closes gh-8465
2017-03-02 17:29:45 +00:00
Andy Wilkinson
b36c8a7c24
Polish "Tighten up PropertiesLauncher's contract"
...
See gh-8346
Closes gh-7221
2017-03-02 11:19:48 +00:00
Dave Syer
e4c807b884
Tighten up PropertiesLauncher's contract
...
The main changes are:
- Switch to `loader.properties` instead of `application.properties`
- Search for `loader.properties` in `loader.home` as well as in
the classpath
- Placeholder replacements in MANIFEST.MF (using `loader.properties`
or system/env vars)
See gh-7221
Closes gh-8346
2017-03-02 11:19:48 +00:00
Stephane Nicoll
b5b69cca03
Merge branch '1.4.x' into 1.5.x
2017-03-02 09:55:29 +01:00
Stephane Nicoll
09205a8fc8
Fix indentation
...
Closes gh-8143
2017-03-02 09:54:34 +01:00
Michael J. Simons
f50a0f9707
Clarify usage of @ImportResource in doc
...
See gh-8143
2017-03-02 09:54:26 +01:00
Kazuki Shimizu
fa4ecff9e0
Update doc about constructor injection
...
Closes gh-8392
2017-02-28 15:57:57 +01:00