Commit Graph

205 Commits

Author SHA1 Message Date
Brian Clozel 7a9d1a1e34 Change default Freemarker template file extension
This commit changes the default file extension for Freemarker templates
from `*.ftl` to `*.ftlh`. This commit also enables by default the
Freemarker setting `"recognize_standard_file_extensions"` to ensure that
HTML escaping is performed by default in Spring Boot applications.

Applications should adapt to this change by changing the file extensions
of existing templates to `.ftlh`.

Closes gh-15131
2019-06-12 15:52:04 +02:00
Andy Wilkinson aef92b9295 Merge branch '2.1.x'
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson 24925c3dae Merge branch '2.0.x' into 2.1.x
Closes gh-17078
2019-06-07 10:50:34 +01:00
Madhura Bhave 1db1c8b03c Validate our own tests work with JUnit5 and the vintage engine
Closes gh-14737

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
2019-05-08 16:05:44 +02:00
Phillip Webb ddbfb2530d Update copyright header of changed files 2019-04-03 17:01:00 -07:00
Phillip Webb ad7eebee9e Merge branch '2.1.x' 2019-04-03 17:00:25 -07:00
Phillip Webb f12ab1ff90 Update copyright header of changed files 2019-04-03 16:13:00 -07:00
Phillip Webb eefd10d4d1 Merge branch '2.0.x' into 2.1.x 2019-04-02 19:40:28 -07:00
Phillip Webb f875b74e67 Reformat samples with spring-javaformat 0.0.8
See gh-16418
2019-04-02 19:39:23 -07:00
Madhura Bhave 6bb5311984 Merge branch '2.1.x' 2019-04-02 15:58:59 -07:00
Madhura Bhave eff2f92c48 Fix formatting following formatter update 2019-04-02 15:55:34 -07:00
Andy Wilkinson 878a635bfb Merge branch '2.1.x' 2019-03-28 11:48:47 +00:00
Andy Wilkinson 864942ad4f Merge branch '2.0.x' into 2.1.x 2019-03-28 09:35:53 +00:00
Andy Wilkinson ba4671f0ab Merge branch '1.5.x' into 2.0.x 2019-03-27 19:59:36 +00:00
Andy Wilkinson 94633cfd89 Merge branch '1.4.x' into 1.5.x 2019-03-27 14:04:32 +00:00
Spring Operator 189eeefbb1 Use HTTPS for external links wherever possible
See gh-16317
2019-03-27 12:30:55 +00:00
Andy Wilkinson baec3d6e8e Merge branch '1.3.x' into 1.4.x 2019-03-27 12:22:40 +00:00
Spring Operator e401d02ced Use HTTPS for external links wherever possible
See gh-16316
2019-03-27 11:35:54 +00:00
Andy Wilkinson 36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson 9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Andy Wilkinson 4b6bddd476 Merge branch '1.4.x' into 1.5.x 2019-03-20 16:30:04 +00:00
Andy Wilkinson 6920c39349 Merge branch '1.3.x' into 1.4.x 2019-03-20 15:06:50 +00:00
Andy Wilkinson 0e009ef047 Use HTTPS to link to the Apache license 2019-03-20 15:00:10 +00:00
Andy Wilkinson b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
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
Spring Operator 991ba550d3 Update build and setup configuration to use HTTPS
See gh-16245
2019-03-19 16:48:30 +00:00
Spring Operator e2837843e1 Update build and setup configuration to use HTTPS
See gh-16244
2019-03-19 16:44:10 +00:00
Spring Operator 7c314122f7 Update build and setup configuration to use HTTPS
See gh-16243
2019-03-19 16:01:05 +00:00
Madhura Bhave 3d0219c315 Merge branch '2.1.x' 2019-03-15 18:09:47 -07:00
Johnny Lim c5b5f752ed Polish
Closes gh-16219
2019-03-15 17:54:48 -07:00
Spring Buildmaster b04710d744 Next development version 2019-01-11 15:59:00 +00:00
Andy Wilkinson 064f6478df Move back to JUnit 4 until SUREFIRE-1614 has been resolved
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
Madhura Bhave 59d2b0a3fb Upgrade tests to Junit5
See gh-14737
2018-12-05 17:49:09 -08:00
Spring Buildmaster 9bb64a3493 Next Development Version 2018-11-29 09:52:39 +00:00
Spring Buildmaster 4d24feb443 Next development version 2018-10-16 08:44:44 +00:00
Spring Buildmaster 46df506b0a Next development version 2018-09-11 14:24:40 +00:00
Spring Buildmaster 73bf744cb0 Next Development Version 2018-07-30 13:37:38 +00:00
Spring Buildmaster 36b8639853 Next Development Version 2018-06-14 10:05:31 +00:00
Phillip Webb e69296d7d3 Fix checkstyle violations in samples 2018-05-25 18:18:00 -07:00
Spring Buildmaster 010b4fccbd Next development version 2018-05-09 09:31:46 +00:00
Spring Buildmaster c10aad165f Next Development Version 2018-04-09 23:14:33 +00:00
Spring Buildmaster ade4760842 Next Development Version 2018-04-05 09:01:52 +00:00
Stephane Nicoll 7473642f58 Harmonize endpoints exclude property
Closes gh-11914
2018-02-12 14:00:40 +01:00
Spring Buildmaster 6414b42335 Next Development Version 2018-01-30 23:29:33 +00:00
Madhura Bhave d65f9b25bc Remove redundant throws Exception 2018-01-25 17:25:38 +05:30
Phillip Webb 017efda6ec Add @EndpointServlet and migrate Jolokia
Add first class support for Servlet based endpoints and rework the
Jolokia endpoint to use it.

Fixes gh-10264
2018-01-24 17:06:13 -08:00
Phillip Webb 9cb5f3da89 Create DynamicRegistrationBean
Extract functionality from the `RegistrationBean` into a new class
designed to work with dynamic registration. Servet and Filter
registration beans now extend from `DynaimcRegistrationBean`, where as
`ServletListenerRegistrationBean` extends directly from
`RegistrationBean`.

This refactor allows the removal of `ServletListenerRegistrationBean`
deprecated methods.

Fixes gh-11344
2018-01-08 22:05:00 -08:00
Stephane Nicoll 23218add90 Polish 2017-12-12 11:57:30 +01:00