root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
21,872 Commits 23 Branches 345 Tags 276 MiB
Commit Graph

44 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
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 afa58bba04 Merge branch '2.1.x' 2019-04-02 19:42:23 -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 9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +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 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
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
Phillip Webb c55b5d7111 Polish 2017-11-01 23:14:52 -07:00
Andy Wilkinson 5aa66305a8 Log warning when open-in-view is implicitly enabled for JPA or Neo4j 
Closes gh-7107
 2017-10-30 12:37:38 +00:00
Andy Wilkinson 991314c63d Merge branch '1.5.x' 2017-06-16 09:13:42 +01:00
Phillip Webb 302f038e84 Polish 2017-05-15 20:35:29 -07:00
Madhura Bhave dc7b3f6d6e Update samples to use new generator mappings 
Closes gh-7612
 2017-05-12 11:35:42 -07:00
Phillip Webb 45dd9f7144 Polish 2017-04-27 12:04:02 -07:00
Madhura Bhave bc1ee76b55 Change default for new_generator_mappings to true 
Closes gh-7612
 2017-04-25 12:09:36 -07:00
Andy Wilkinson 5c0d400c23 Align Hibernate 5 join table names with those from SpringNamingStrategy 
Previously, the name of a join table when using Hibernate 5 would
differ from those when using Hibernate 4 with the default
SpringNamingStrategy.

This commit introduces SpringImplicitNamingStrategy which customises the
name of join tables to match those produced by SpringNamingStrategy.

Closes gh-5880
 2016-05-11 10:52:43 +01:00
Andy Wilkinson 46407c6763 Align JPA sample with Hibernate 5.1’s table naming 
The name of the table for a many-to-many relationship has changed in
Hibernate 5.1.

This commit updates the JPA sample’s import.sql accordingly. It also
updates the repository integration tests to verify that the data has
been imported successfully.

Closes gh-5880
 2016-05-10 17:29:23 +01:00
Andy Wilkinson 3348ed5bb3 Make use of new GetMapping and PostMapping annotations 
Closes gh-5277
 2016-05-09 17:08:16 +01:00
Phillip Webb b398b3319c Rename @SpringApplicationTest -> @SpringBootTest 
Rename @SpringApplicationTest to SpringBootTest and
@SpringApplicationContextLoader to @SpringBootContextLoader.

Fixes gh-5562
 2016-04-04 22:36:58 -07:00
Phillip Webb 4d404b214c Migrate away from @SpringApplicationConfiguration 
Refactor internal tests to no longer use @SpringApplicationConfiguration

See gh-5562
 2016-04-04 22:36:57 -07:00
Phillip Webb c28f552883 Migrate SpringJUnit4ClassRunner to SpringRunner 
Replace all existing SpringJUnit4ClassRunner references with the new
SpringRunner alias.

Fixes gh-5292
 2016-03-23 22:18:18 -07:00
Phillip Webb 2f815a907a Migrate existing tests from deprecated package 
Update the existing tests to use the relocated `spring-boot-test`
classes. Restructuring was achieved using the following command:

find . -type f -name '*.java' -exec sed -i '' \
-e s/org.springframework.boot.test.ConfigFileApplicationContextInitializer/\
org.springframework.boot.test.context.ConfigFileApplicationContextInitializer/g \
-e s/org.springframework.boot.test.EnvironmentTestUtils/\
org.springframework.boot.test.util.EnvironmentTestUtils/g \
-e s/org.springframework.boot.test.IntegrationTest/\
org.springframework.boot.test.context.IntegrationTest/g \
-e s/org.springframework.boot.test.IntegrationTestPropertiesListener/\
org.springframework.boot.test.context.IntegrationTestPropertiesListener/g \
-e s/org.springframework.boot.test.OutputCapture/\
org.springframework.boot.test.rule.OutputCapture/g \
-e s/org.springframework.boot.test.SpringApplicationConfiguration/\
org.springframework.boot.test.context.SpringApplicationConfiguration/g \
-e s/org.springframework.boot.test.SpringApplicationContextLoader/\
org.springframework.boot.test.context.SpringApplicationContextLoader/g \
-e s/org.springframework.boot.test.SpringBootMockServletContext/\
org.springframework.boot.test.mock.web.SpringBootMockServletContext/g \
-e s/org.springframework.boot.test.TestRestTemplate/\
org.springframework.boot.test.web.client.TestRestTemplate/g \
-e s/org.springframework.boot.test.WebIntegrationTest/\
org.springframework.boot.test.context.web.WebIntegrationTest/g {} \;

See gh-5293
 2016-03-23 22:17:50 -07:00
Andy Wilkinson 44ddfcc7fa Upgrade copyright headers of all files changed in 2016 2016-02-25 12:09:42 +00:00
Phillip Webb 1cc1fc6431 Use AssertJ in spring-boot-samples 
See gh-5083
 2016-02-06 15:51:26 -08:00
Phillip Webb 1e4d974ec0 Merge remote-tracking branch 'local12x/1.2.x' 2015-10-19 12:56:55 -07:00
Phillip Webb a79131f8d2 Organize imports with new settings 
See gh-4234
 2015-10-19 12:55:44 -07:00
Phillip Webb d09805fd75 Polish license headers 2015-09-08 16:05:05 -07:00
Stephane Nicoll 7c0c953f81 Add value alias for SpringApplicationConfiguration 
Given that Spring Boot uses java config accross the board, a new `value`
attribute is now aliased to the existing `classes` attribute such that
one could write the following:

@SpringApplicationConfiguration(MyConfig.class)
public class MyTest {}

Closes gh-3635
 2015-08-19 17:09:34 +02:00
Andy Wilkinson 6d97785030 Add a plain JPA sample application 
Closes gh-1761
 2014-11-25 10:23:32 +00:00