4 Commits

Author	SHA1	Message	Date
Stephane Nicoll	4604bb7e8a	Merge branch '1.5.x'	2016-12-30 18:01:59 +01:00
Stephane Nicoll	a19a28062f	Fix actuator security in samples ... Closes gh-7637	2016-12-30 17:56:19 +01:00
Stephane Nicoll	80df396e3c	Fix parent version	2016-12-27 12:43:15 +01:00
Phillip Webb	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