Commit Graph

116 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
Phillip Webb
d306b31ce9 Merge branch '2.1.x' 2019-06-04 02:08:00 -07:00
Phillip Webb
ccfbd03482 Merge branch '2.0.x' into 2.1.x 2019-06-04 02:07:14 -07:00
Phillip Webb
5fba43aa31 Merge branch '1.5.x' into 2.0.x 2019-06-04 00:05:57 -07:00
Phillip Webb
32068c21a3 Polish resource files to all end with a new line 2019-06-03 23:48:43 -07:00
Spring Buildmaster
67fa63d0e3 Next Development Version 2019-05-14 08:21:02 +00: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
Spring Buildmaster
ca3a864565 Next Development Version 2019-04-03 10:34:44 +00:00
Phillip Webb
afa58bba04 Merge branch '2.1.x' 2019-04-02 19:42:23 -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
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
Andy Wilkinson
d6a869fa98 Switch to Jakarta EE API dependencies where possible
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00: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
Stephane Nicoll
d1ac774af2 Configure build to be compatible with Java 11
See gh-14028
2018-08-17 15:16:02 +02: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
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
Andy Wilkinson
8608202e56 Remove Surefire workarounds that are not needed with 2.21
Closes gh-12721
2018-04-05 07:48:09 +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
Stephane Nicoll
c2c8b7dfe8 Clarify the required changes to run certain samples with Java9
This commit moves the Java9-specific profile to each sample rather than
impacting all samples. That way, affected samples are more self
contained.

Closes gh-12302
2018-03-02 12:58:25 +01:00
Spring Buildmaster
6414b42335 Next Development Version 2018-01-30 23:29:33 +00:00
Phillip Webb
adfb6dc128 Polish 2018-01-25 13:20:29 -08:00
Madhura Bhave
d65f9b25bc Remove redundant throws Exception 2018-01-25 17:25:38 +05:30
Brian Clozel
eec7a8f075 Remove Web depedency from Freemarker starter
Now that Spring Boot supports Freemarker for both Spring MVC and Spring
WebFlux, the dedicated starter should not pull the Web starter
transitively and let developers manually choose the web stack.

Closes gh-11246
2017-12-03 11:23:43 -08:00