Stephane Nicoll
ba05f4012c
Merge branch '1.5.x'
2017-02-08 14:32:58 +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
beecbe30b9
Merge branch '1.5.x'
2017-02-08 09:44:22 +00:00
Andy Wilkinson
64b65e1fe5
Merge branch '1.4.x' into 1.5.x
2017-02-08 09:44:04 +00:00
Andy Wilkinson
30074431a7
Improve documentation of static resource reloading with devtools
...
Closes gh-5133
Closes gh-7886
2017-02-08 09:43:31 +00:00
Brian Clozel
12d883f6b9
Introduce "server.servlet" configuration prefix
...
This commit refactors the `ServerProperties` property keys and
introduces a separate "server.servlet" namespace to isolate
servlet-specific properties from the rest.
Closes gh-8066
2017-02-07 16:48:22 +01:00
Stephane Nicoll
a31a792192
Merge branch '1.5.x'
2017-02-07 16:35:59 +01:00
Stephane Nicoll
d42a54e880
Add explicit note about Mockito 2 in the documentation
...
Closes gh-8217
2017-02-07 16:35:16 +01:00
Stephane Nicoll
130e0808d0
Merge branch '1.4.x' into 1.5.x
2017-02-07 16:31:02 +01:00
Stephane Nicoll
570b0593a6
Document SMTP timeout settings
...
Closes gh-8213
2017-02-07 16:22:03 +01:00
Stephane Nicoll
008aef6142
Document @LiquibaseDataSource feature
...
Closes gh-8214
2017-02-07 16:16:19 +01:00
Brian Clozel
8619d6a229
Rename EmbeddedServletContainer -> EmbeddedWebServer
...
This contract is not specific to servlet containers and should be
reused by all web server implementations (including reactive variants).
Fixes gh-8208
2017-02-06 17:44:26 +01:00
Stephane Nicoll
fb19b36595
Merge branch '1.5.x'
2017-02-05 09:26:52 +01:00
Stephane Nicoll
3d1f8aa8d7
Merge branch '1.4.x' into 1.5.x
2017-02-05 09:25:48 +01:00
Stephane Nicoll
a30461c5c7
Polish pid metadata
...
This commit moves the `spring.pid.*` metadata to the relevant project. It
also updates the doc to refer to the new `ApplicationPidFileWriter`
rather than the one in its deprecatred form.
Closes gh-8196
2017-02-05 09:23:56 +01:00
zhanhb
22ba7b93b2
Fix pid properties link in documentation
...
See gh-8196
2017-02-05 09:14:01 +01:00
Stephane Nicoll
5c663a9ece
Merge branch '1.5.x'
2017-02-01 09:08:33 +01:00
Johnny Lim
846994e498
Polish
...
Closes gh-8148
2017-02-01 09:07:47 +01:00
Stephane Nicoll
715f8d7436
Merge branch '1.5.x'
2017-02-01 08:57:22 +01:00
Stephane Nicoll
8a0f8cf953
Merge branch '1.4.x' into 1.5.x
2017-02-01 08:57:07 +01:00
Stephane Nicoll
b9ede6b281
Polish contribution
...
Closes gh-8157
2017-02-01 08:56:22 +01:00
Raja Kolli
a1c601ca28
Update copyright header
...
See gh-8157
2017-02-01 08:55:36 +01:00
Andy Wilkinson
4ea7dc6f31
Polish "Upgrade to Flyway 4.0"
...
See gh-5344
2017-01-30 10:48:36 +00:00
Phillip Webb
8747e039ee
Merge branch '1.5.x'
2017-01-27 17:50:01 -08:00
Peter Szanto
14bd404b71
Document AWS Elastic Beanstalk deployment
...
Update the reference documentation to include details of Amazon
Elastic Beanstalk.
Closes gh-7948
2017-01-27 17:47:59 -08:00
Brian Clozel
de98c4b3ff
Provide Reactor 3 auto-configuration
...
This commit provides auto-configuration for the Reactor Core 3 library.
A new configuration namespace, "spring.reactor" allows to configure
hooks on operators, like "spring.reactor.stacktrace-mode.enabled".
This property is enabled automatically by devtools, since it improves
the developer experience and provides full stacktrace information when
exceptions occur (but at a performance cost).
Fixes gh-7302
2017-01-26 10:35:12 +01:00
Phillip Webb
17451c5e7a
Merge branch '1.5.x'
2017-01-25 22:24:07 -08:00
Phillip Webb
71601c3b96
Merge branch '1.4.x' into 1.5.x
2017-01-25 16:48:33 -08:00
Phillip Webb
2cf93f89f5
Polish
2017-01-25 16:45:59 -08:00
Andy Wilkinson
9bba73a1a9
Upgrade to Thymeleaf 3 and drop support for Thymleaf 2
...
This commit raises the minimum supported version of Thymeleaf to
3.0.x. It also upgrades Spring Social to a version that is compatible
with Thymeleaf 3.
Closes gh-7450
Closes gh-6258
See gh-7885
2017-01-25 13:59:09 +00:00
Stephane Nicoll
661fd848eb
Merge branch '1.5.x'
2017-01-25 11:02:32 +01:00
Stephane Nicoll
79233b019e
Fix keys format for embedded mongodb support
...
Closes gh-8102
2017-01-25 11:01:52 +01:00
Stephane Nicoll
265a712294
Fix keys format for embedded mongodb support
...
Closes gh-8102
2017-01-25 10:41:47 +01:00
Andy Wilkinson
ef4f83e7b1
Update reference guide to reflect Java 8 requirement
...
Closes gh-8090
2017-01-24 20:25:54 +00:00
Andy Wilkinson
dbd10a8daa
Remove support for Jetty 9.3 and earlier
...
Closes gh-7985
2017-01-24 20:00:50 +00:00
Andy Wilkinson
0807c27c26
Complete removing support for Tomcat 7
...
Closes gh-6416
2017-01-24 17:26:30 +00:00
Stephane Nicoll
d67ce78e8b
Merge branch '1.5.x'
2017-01-24 13:23:06 +01:00
Johnny Lim
e0de28a1f7
Polish
...
Closes gh-8076
2017-01-24 13:22:22 +01:00
Stephane Nicoll
1f164906dc
Merge branch '1.5.x'
2017-01-24 09:56:47 +01:00
Stephane Nicoll
4a60de78ff
Merge branch '1.4.x' into 1.5.x
2017-01-24 09:56:26 +01:00
Stephane Nicoll
4efa4590f8
Review doc on advanced datasource customization
...
Closes gh-7652
2017-01-24 09:55:13 +01:00
Phillip Webb
8ffaa54e74
Merge branch '1.5.x'
2017-01-23 23:45:44 -08:00
Phillip Webb
2c89d9918f
Relocate AutoConfigurations from root package
...
Move PropertyPlaceholder and MessageSource auto-configuration from the
root package to the `context` subpackage.
Fixes gh-8071
2017-01-23 17:32:45 -08:00
Andy Wilkinson
a7ee2b8e0e
Merge branch '1.5.x'
2017-01-23 10:23:13 +00:00
Andy Wilkinson
0067082eac
Document a warning about embedded Tomcat and tmpwatch on CentOS
...
Closes gh-5009
2017-01-23 10:22:51 +00:00
Andy Wilkinson
1f183bd320
Merge branch '1.5.x'
2017-01-23 10:00:50 +00:00
Andy Wilkinson
68fdd49a0b
Document payload types of messages sent to metricsChannel
...
Closes gh-7790
2017-01-23 10:00:42 +00:00
Andy Wilkinson
d5a4058862
Merge branch '1.5.x'
2017-01-20 15:45:34 +00:00
Andy Wilkinson
bfd319755c
Merge branch '1.4.x' into 1.5.x
2017-01-20 15:45:23 +00:00
