1936 Commits

Author SHA1 Message Date
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
Phillip Webb
ca1540cefe Update header copyright for changed files 2017-02-27 20:41:18 -08:00
Phillip Webb
47fd5f4fac Merge branch '1.4.x' into 1.5.x 2017-02-27 14:00:46 -08:00
Phillip Webb
47b00c086c Polish 2017-02-27 13:56:17 -08:00
Stephane Nicoll
f032d2fe03 Polish
Closes gh-8412
2017-02-26 23:18:48 +01:00
Stephane Nicoll
43a534f4ca Polish contribution
Closes gh-8195
2017-02-20 14:03:07 +01:00
Raja Kolli
a5a2c04d23 Fix version of gradle-git-properties in doc
Closes gh-8273
2017-02-19 16:41:28 +01:00
Stephane Nicoll
121ab0a71e Merge branch '1.4.x' into 1.5.x 2017-02-17 10:32:49 +01:00
Vedran Pavic
1c8f1c709c Fix audit events related documentation
Closes gh-8319
2017-02-17 10:30:07 +01:00
Stephane Nicoll
d4d45a1009 Merge branch '1.4.x' into 1.5.x 2017-02-15 17:24:04 +01:00
Johnny Lim
0f5fefd561 Fix a broken AsciiDoc attribute declaration
Closes gh-8300
2017-02-15 17:23:33 +01:00
Stephane Nicoll
7920543480 Add note regarding the detection of spring.jpa.database
Closes gh-8253
2017-02-14 15:16:17 +01:00
Stephane Nicoll
6993854c55 Explain how to downgrade to Jackson 2.6
Closes gh-8192
2017-02-14 13:31:57 +01:00
Stephane Nicoll
bd6d1b74c0 Merge branch '1.4.x' into 1.5.x 2017-02-13 10:08:51 +01:00
Stephane Nicoll
bcbcb9c00b Clarify use of DataSource for batch apps
Closes gh-8271
2017-02-13 10:08:40 +01:00
Stephane Nicoll
6c4013249b Merge branch '1.4.x' into 1.5.x 2017-02-12 13:59:19 +01:00
Stephane Nicoll
58a4f04962 Fix typo in documentation
Closes gh-8259
2017-02-12 13:59:04 +01:00
Stephane Nicoll
aa49468171 Allow to define a custom MessageRecoverer
This commit improves `SimpleRabbitListenerContainerFactoryConfigurer` to
use a custom `MessageConverter`. If such a bean is present, it is used
for the default factory that is auto-configured.

Closes gh-8194
2017-02-09 10:43:03 +01:00
Stephane Nicoll
aff50f6787 Merge branch '1.4.x' into 1.5.x 2017-02-08 14:32:45 +01:00
Kamil Wozniak
f46e3dc9f3 Fix link in doc to Spring Test
Closes gh-8226
2017-02-08 14:31:42 +01:00
Andy Wilkinson
64b65e1fe5 Merge branch '1.4.x' into 1.5.x 2017-02-08 09:44:04 +00:00