8ffaa54e74
Merge branch '1.5.x'
2017-01-23 23:45:44 -08:00
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
77f9bb09ca
Further Polish Mockito 2 support
...
See gh-7770
2017-01-05 14:29:29 -08:00
53f1df86a2
Merge branch '1.5.x'
2016-12-30 12:17:28 -08:00
aacf5d660f
Update copyright year for changed files
2016-12-30 11:53:51 -08:00
be3fe12cf0
Polish
2016-12-30 11:46:24 -08:00
4604bb7e8a
Merge branch '1.5.x'
2016-12-30 18:01:59 +01:00
a19a28062f
Fix actuator security in samples
...
Closes gh-7637
2016-12-30 17:56:19 +01:00
80df396e3c
Fix parent version
2016-12-27 12:43:15 +01:00
a23591e047
Support Jetty 9.4 and upgrade to 9.4.0.v20161208
...
Update `JettyEmbeddedServletContainerFactory` to support Jetty 9.4
directly and Jetty 9.3 via reflection. The primary difference between
Jetty 9.3 and 9.4 are the session management classes. Websocket suppport
has also been updates, but this is handled transparently by the
Spring Framework support.
Fixes gh-7599
2016-12-24 11:22:38 -08:00
Phillip Webb
Stephane Nicoll