Commit Graph

18 Commits

Author SHA1 Message Date
Andy Wilkinson
a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator
3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
2019-03-19 16:58:31 +00:00
Stephane Nicoll
d1ac774af2 Configure build to be compatible with Java 11
See gh-14028
2018-08-17 15:16:02 +02:00
Andy Wilkinson
45fdf2ffa4 Support Tomcat 9 and Undertow 2
Closes gh-11749
Closes gh-12243
2018-06-28 11:33:30 +01:00
Andy Wilkinson
f7c8be1877 Apply java9 profile to JDK 10 (and later) as well as JDK 9
See gh-12028
2018-03-02 15:28:03 +00:00
Andy Wilkinson
5d041a628b Disable Jetty JSP sample tests with Java 9
Closes gh-10456
2018-03-01 17:53:10 +00:00
Andy Wilkinson
6336aa3956 Reinstate testing of JSP samples using Java 9
Closes gh-10456
2018-03-01 13:11:08 +00:00
Ivan Sopov
d8fa71bc97 Samples cleanup
- Modifying dependencies to starter-web with tomcat exclusion plus
  alternative servlet container instead of manual dependency on
  spring-webmvc as it is the preferrable way to use alternative servlet
  container
- Previously RestTemplate with ssl was configured manually in tests - now
  it rellies on autoconfiguration - changed this for multi-connector test
  and added test to ensure that ssl autoconfiguration is working
- Most samples with alterntative servlet containers used some kind of
  service reading property and returning default since it wasn't
  configured - removed it, since it is not specific to using alternative
  servlet containers.

See gh-10548
2017-11-14 15:39:27 +01:00
Phillip Webb
2855010841 Fix sample POMs
Update sample POMs to follow CI friendly Maven conventions.

See gh-9316
2017-10-04 16:34:39 -07:00
Andy Wilkinson
5a13a32f6c Revert "Reinstate testing of Jetty JSP sample on Java 9"
This reverts commit bbca612a57.
StandardJarScanner, which contains the faulty assumption about
URLClassLoader is part of Jasper. Jetty, like Tomcat, uses Jasper for
JSPs so it's also affected.

See gh-10456
2017-09-30 09:58:36 +01:00
Andy Wilkinson
bbca612a57 Reinstate testing of Jetty JSP sample on Java 9
See gh-10456
2017-09-29 14:16:38 +01:00
Stephane Nicoll
5ba2906045 Disable JSP sample tests on Java 9
See gh-10456
2017-09-29 12:07:13 +02:00
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
Vladimir Tsanev
b303b3fe35 Support JSPs in Embedded Jetty
JSPs are now supported in executable WARs with embedded Jetty.

Fixes gh-367
Closes gh-5290
2016-06-15 16:01:54 +02:00