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
176aabb487
Merge branch '2.1.x'
2019-06-11 17:21:40 -07:00
fa4c433c92
Polish
2019-06-11 17:21:13 -07:00
b3d5cd538d
Add JUnit 5 checkstyle rules
...
Add a rule to enforce JUnit 5 usage and conventions.
Closes gh-17093
2019-06-10 16:16:45 -07:00
b18fffaf14
Move tests to JUnit 5 wherever possible
2019-06-07 12:25:54 +01:00
aef92b9295
Merge branch '2.1.x'
...
Closes gh-17079
2019-06-07 11:00:44 +01:00
24925c3dae
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17078
2019-06-07 10:50:34 +01:00
db75347eb6
Merge branch '2.1.x'
2019-06-04 14:41:20 -07:00
0ef331018e
Merge branch '2.0.x' into 2.1.x
2019-06-04 14:30:52 -07:00
7fc01971ed
Merge branch '1.5.x' into 2.0.x
2019-06-04 14:20:25 -07:00
d548c5ed31
Fix checkstyle violations
2019-06-04 12:45:23 -07:00
e161c6f826
Broaden files covered by checkstyle
...
Closes gh-16682
2019-06-04 12:45:23 -07:00
e06325e029
Merge branch '2.1.x'
2019-06-04 08:57:42 -07:00
930d110178
Merge branch '2.0.x' into 2.1.x
2019-06-04 08:55:31 -07:00
90468c4d53
Fix checkstyle violation in OAuth sample
2019-06-04 08:53:06 -07:00
d306b31ce9
Merge branch '2.1.x'
2019-06-04 02:08:00 -07:00
ccfbd03482
Merge branch '2.0.x' into 2.1.x
2019-06-04 02:07:14 -07:00
80d8a5cfa2
Add nohttp checkstyle rule
...
Closes gh-16682
2019-06-04 00:52:45 -07:00
cd537155a9
Use https for Thymeleaf xmlns:layout
2019-06-04 00:52:45 -07:00
a99131f727
Polish resource files to all end with a new line
2019-06-04 00:52:45 -07:00
5fba43aa31
Merge branch '1.5.x' into 2.0.x
2019-06-04 00:05:57 -07:00
e61f7a33a7
Add nohttp checkstyle rule
...
Closes gh-16682
2019-06-03 23:51:59 -07:00
0049f1985c
Use https for Thymeleaf xmlns:layout
2019-06-03 23:50:06 -07:00
32068c21a3
Polish resource files to all end with a new line
2019-06-03 23:48:43 -07:00
c74badd4f2
Auto-configure Elasticsearch REST client in Spring Data
...
This commit auto-configures the Elasticsearch REST client support
as a template for Spring Data Elasticsearch. As of this commit,
using the transport client is still possible but developers
should migrate.
This commit also removes the deprecated annotation on the
Elasticsearch auto-configuration for the transport client, since
this deprecation notice is already present on the configuration
property.
Closes gh-17024
Closes gh-16542
2019-06-03 21:20:06 +02:00
0644a79401
Repackage output capture and always use extension declaratively
...
Closes gh-17029
2019-05-31 18:33:10 +01:00
d11d5ceb29
Split up JUnit 5 OutputCapture class
...
Split the JUnit 5 `OutputCapture` class into separate `OutputExtension`
and `CapturedOutput` classes. The JUnit 5 callback methods are now
contained only in the `OutputExtension` class so no longer pollute the
public API that users will interact with.
The `CapturedOutput` class has also been updated to capture System.err
and System.out separately to allow distinct assertions if required.
Closes gh-17029
2019-05-30 23:44:35 -07:00
080a2f5c3b
Align with Framework’s removal of charset attribute from application/json
...
Closes gh-16979
2019-05-28 10:58:23 +01:00
3a9ca5fa30
Update copyright header of changed files
2019-05-14 21:05:53 -07:00
6b3c15a858
Fixup version numbers following release
2019-05-14 15:43:47 +02:00
67fa63d0e3
Next Development Version
2019-05-14 08:21:02 +00:00
b7700ed094
Improve reliability of kafka sample integration test
2019-05-14 09:40:46 +02:00
1c3a91883d
Remove reference to spring.datasource.jmx-enabled
...
This commits moves the single use of that property to the already
existing Tomcat-specific one.
Closes gh-16673
2019-05-13 17:11:03 +02:00
fd0c773939
Increase timeout for Kafka sample
2019-05-13 16:13:04 +02:00
fddc8bd8ef
Create Kafka sample topic
2019-05-10 10:45:46 +02:00
81af0f2fa6
Explicitly include JUnit 4 in test starter
...
Closes gh-16807
2019-05-09 14:54:13 +02:00
1de6f68238
Document that JUnit 5 is the default
...
See gh-14736
2019-05-08 16:05:44 +02:00
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
83889188c2
Revert accidental TomcatSample changes
2019-04-15 20:08:44 -07:00
2dfd916c96
Polish
2019-04-15 17:51:08 -07:00
bbaa98175f
Upgrade to Hazelcast 3.12
...
Closes gh-16503
2019-04-11 12:38:47 +02:00
ce0282406f
Skip lazy init for beans that explicitly set lazy to false
...
This commit also adds tests to ensure that the child
management context works when lazy initialization is
enabled. Also, it adds a BeanFactoryPostProcessor to
the child context so that the server is created and
listening for requests but other beans in the child
context are not created until requested.
See gh-16184
2019-04-05 18:02:26 -07:00
ddbfb2530d
Update copyright header of changed files
2019-04-03 17:01:00 -07:00
ad7eebee9e
Merge branch '2.1.x'
2019-04-03 17:00:25 -07:00
f12ab1ff90
Update copyright header of changed files
2019-04-03 16:13:00 -07:00
0d256da068
Fixup version numbers following release
2019-04-03 12:56:41 +02:00
ca3a864565
Next Development Version
2019-04-03 10:34:44 +00:00
f25469c95f
Update formatting with spring-javaformat 0.0.9
...
See gh-16421
2019-04-02 20:43:36 -07:00
cae6a82322
Upgrade to spring-javaformat 0.0.9
...
Closes gh-16421
2019-04-02 20:34:35 -07:00
afa58bba04
Merge branch '2.1.x'
2019-04-02 19:42:23 -07:00
Brian Clozel
Madhura Bhave
Phillip Webb
Andy Wilkinson
Stephane Nicoll
Spring Buildmaster
Vedran Pavic