d811b5fb1d
Merge branch '1.5.x'
2017-03-03 10:31:26 +01:00
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
1c789f1a8d
Remove dependency management for `hibernate-entitymanager`
...
Closes gh-8433
2017-03-02 18:31:53 +01:00
9c88ba3b90
Merge branch '1.5.x'
2017-03-02 17:30:44 +00:00
6673d8eebc
Polish "Allow loader.path to refer to nested jars"
...
Closes gh-8334
Closes gh-8465
2017-03-02 17:29:45 +00:00
b6e8a280fd
Merge branch '1.5.x'
2017-03-02 11:22:17 +00:00
b36c8a7c24
Polish "Tighten up PropertiesLauncher's contract"
...
See gh-8346
Closes gh-7221
2017-03-02 11:19:48 +00:00
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
ed7c6e2063
Merge branch '1.5.x'
2017-03-02 09:55:44 +01:00
b5b69cca03
Merge branch '1.4.x' into 1.5.x
2017-03-02 09:55:29 +01:00
09205a8fc8
Fix indentation
...
Closes gh-8143
2017-03-02 09:54:34 +01:00
f50a0f9707
Clarify usage of @ImportResource in doc
...
See gh-8143
2017-03-02 09:54:26 +01:00
20bd0f94d6
Merge branch '1.5.x'
2017-02-28 15:58:23 +01:00
fa4ecff9e0
Update doc about constructor injection
...
Closes gh-8392
2017-02-28 15:57:57 +01:00
a4bcd20b64
Merge branch '1.5.x'
2017-02-27 20:43:18 -08:00
ca1540cefe
Update header copyright for changed files
2017-02-27 20:41:18 -08:00
47fd5f4fac
Merge branch '1.4.x' into 1.5.x
2017-02-27 14:00:46 -08:00
47b00c086c
Polish
2017-02-27 13:56:17 -08:00
30564eb619
Merge branch '1.5.x'
2017-02-26 23:19:14 +01:00
f032d2fe03
Polish
...
Closes gh-8412
2017-02-26 23:18:48 +01:00
f12a634843
Fix typo in spring-webflux dependency
2017-02-24 14:03:16 +01:00
d1eafa29da
Add missing dependency in docs generation
...
Reactor Netty and Spring WebFlux were missing.
2017-02-24 13:57:09 +01:00
91009cfc01
Merge branch '1.5.x'
2017-02-20 14:04:55 +01:00
43a534f4ca
Polish contribution
...
Closes gh-8195
2017-02-20 14:03:07 +01:00
ef8846770b
Merge branch '1.5.x'
2017-02-19 16:42:48 +01:00
a5a2c04d23
Fix version of `gradle-git-properties` in doc
...
Closes gh-8273
2017-02-19 16:41:28 +01:00
3c956441b5
Merge branch '1.5.x'
2017-02-17 10:33:08 +01:00
121ab0a71e
Merge branch '1.4.x' into 1.5.x
2017-02-17 10:32:49 +01:00
1c8f1c709c
Fix audit events related documentation
...
Closes gh-8319
2017-02-17 10:30:07 +01:00
4301265dba
Merge branch '1.5.x'
2017-02-15 17:24:20 +01:00
d4d45a1009
Merge branch '1.4.x' into 1.5.x
2017-02-15 17:24:04 +01:00
0f5fefd561
Fix a broken AsciiDoc attribute declaration
...
Closes gh-8300
2017-02-15 17:23:33 +01:00
7cb451b934
Merge branch '1.5.x'
2017-02-14 15:16:42 +01:00
7920543480
Add note regarding the detection of `spring.jpa.database`
...
Closes gh-8253
2017-02-14 15:16:17 +01:00
6993854c55
Explain how to downgrade to Jackson 2.6
...
Closes gh-8192
2017-02-14 13:31:57 +01:00
fe552fc920
Merge branch '1.5.x'
2017-02-13 10:09:04 +01:00
bd6d1b74c0
Merge branch '1.4.x' into 1.5.x
2017-02-13 10:08:51 +01:00
bcbcb9c00b
Clarify use of `DataSource` for batch apps
...
Closes gh-8271
2017-02-13 10:08:40 +01:00
ca2f8778f4
Merge branch '1.5.x'
2017-02-12 13:59:37 +01:00
6c4013249b
Merge branch '1.4.x' into 1.5.x
2017-02-12 13:59:19 +01:00
58a4f04962
Fix typo in documentation
...
Closes gh-8259
2017-02-12 13:59:04 +01:00
25a025cf36
Fix doc generation
2017-02-09 16:54:05 +01:00
b30d4303d5
Polish contribution
...
Closes gh-8230
2017-02-09 15:54:59 +01:00
064faf9560
Merge branch '1.5.x'
2017-02-09 10:43:20 +01:00
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
ba05f4012c
Merge branch '1.5.x'
2017-02-08 14:32:58 +01:00
aff50f6787
Merge branch '1.4.x' into 1.5.x
2017-02-08 14:32:45 +01:00
f46e3dc9f3
Fix link in doc to Spring Test
...
Closes gh-8226
2017-02-08 14:31:42 +01:00
beecbe30b9
Merge branch '1.5.x'
2017-02-08 09:44:22 +00:00
64b65e1fe5
Merge branch '1.4.x' into 1.5.x
2017-02-08 09:44:04 +00:00
Stephane Nicoll
Vedran Pavic
Andy Wilkinson
Dave Syer
Michael J. Simons
Kazuki Shimizu
Phillip Webb
Brian Clozel
Raja Kolli
Johnny Lim
Kamil Wozniak