15 Commits

Author	SHA1	Message	Date
Phillip Webb	53f1df86a2	Merge branch '1.5.x'	2016-12-30 12:17:28 -08:00
Phillip Webb	be3fe12cf0	Polish	2016-12-30 11:46:24 -08:00
Stephane Nicoll	6643ec3713	Next development version	2016-09-21 17:05:50 +02:00
Spring Buildmaster	7e9ed5e1a7	Next Development Version	2016-09-21 07:58:07 +00:00
Spring Buildmaster	334baaeffd	Next development version	2016-07-28 19:54:01 +00:00
Andy Wilkinson	f28e3d54c5	Upgrade to Tomcat 8.5.3 ... This commit changes the default version of Tomcat to 8.5.3 while also retaining support for Tomcat 8.0 and 7.0. The main difference in 8.5 is that the ServerSocketFactory abstraction that allowed the TrustStore and KeyStore to be configured programatically no longer exists. This logic has been replaced with the use of a custom URL protocol (springbootssl) that provides access to the key store and trust store of an SslStoreProvider. In addition to working with 8.5, this approach has the advantage of also working with 8.0 and 7.0. Closes gh-6164	2016-06-20 13:27:47 +01:00
Phillip Webb	fbaf209240	Move master to 1.4.0.BUILD-SNAPSHOT	2016-01-24 10:45:24 -08:00
Spring Buildmaster	504d3e97ba	Next development version	2016-01-21 18:41:30 -08:00
Spring Buildmaster	8db59059a5	Next Development Version	2015-12-18 05:43:02 -08:00
Spring Buildmaster	3f6f57a80e	Next Development Version	2015-11-16 03:18:54 -08:00
Phillip Webb	a57a88f5cf	Move master to 1.3.0.BUILD-SNAPSHOT	2015-02-26 17:01:02 -08:00
Spring Buildmaster	8f0ad02237	Next development version	2015-02-26 15:26:53 -08:00
Spring Buildmaster	60725cd8bd	Next development version	2015-01-07 23:37:07 -08:00
Spring Buildmaster	1a788c1741	Next development version	2014-12-10 16:35:50 -08:00
Andy Wilkinson	0960908bd7	Add support for configuring SSL declaratively ... Both Tomcat and Jetty can now be configured to use SSL via the environment (typically application.properties or application.yml) Closes #1084	2014-07-24 15:10:09 +01:00