fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,971 Commits 22 Branches 339 Tags
Commit Graph

15201 Commits

Author SHA1 Message Date
Stephane Nicoll
a2eeb77e21 Merge branch '2.6.x' into 2.7.x 
Closes gh-28951
 2021-12-09 16:00:09 +01:00
Vedran Pavic
0af4431db8 Apply SameSite session cookie property to Spring Session 
This commit maps the `server.servlet.session.cookie.same-site`
configuration property to the `DefaultCookieSerializer` bean configured
in the Spring Session auto-configuration.

See gh-28784
 2021-12-09 15:53:50 +01:00
Stephane Nicoll
89635eafa3 Update copyright year of changed files 
See gh-28862
 2021-12-09 15:48:47 +01:00
Stefano Cordio
a5c56043b9 Simplify AssertJ usage 
See gh-28862
 2021-12-09 15:39:02 +01:00
Stephane Nicoll
2b3827332f Merge branch '2.6.x' into 2.7.x 
Closes gh-28946
 2021-12-09 15:09:46 +01:00
izeye
0364353204 Add public accessor for StackdriverProperties.useSemanticMetricTypes 
See gh-28944
 2021-12-09 15:09:13 +01:00
Stephane Nicoll
a323ff7136 Merge branch '2.6.x' into 2.7.x 
Closes gh-28945
 2021-12-09 15:06:26 +01:00
Stephane Nicoll
5599e8d340 Polish "Add consistent quotes in YAML samples of reference doc" 
See gh-28911
 2021-12-09 15:02:47 +01:00
Viktor Ardelean
0b781d87b1 Add consistent quotes in YAML samples of reference doc 
See gh-28911
 2021-12-09 15:02:23 +01:00
Andy Wilkinson
51957f18c4 Merge branch '2.6.x' into 2.7.x 
Closes gh-28942
 2021-12-09 12:52:04 +00:00
Artur Signell
ad754abba3 Make ErrorPageSecurityFilter compatible with Servlet 3.1 
See gh-28902
 2021-12-09 12:36:35 +00:00
Stephane Nicoll
7af589d31a Merge branch '2.6.x' into 2.7.x 
Closes gh-28937
 2021-12-09 10:46:04 +01:00
Stephane Nicoll
25a2888be5 Fix default value of spring.mvc.pathmatch.matching-strategy property 
Closes gh-28936
 2021-12-09 10:45:21 +01:00
Scott Frederick
3cb30cb283 Merge branch '2.6.x' into 2.7.x 
Closes gh-28923
 2021-12-07 14:10:46 -06:00
Scott Frederick
3555837845 Merge branch '2.5.x' into 2.6.x 
Closes gh-28922
 2021-12-07 14:10:28 -06:00
Scott Frederick
b0b2cd79b4 Use latest buildpack image tag when no tag is provided 
Fixes gh-28921
 2021-12-07 14:10:10 -06:00
Scott Frederick
61fb9f83df Merge branch '2.6.x' into 2.7.x 
Closes gh-28905
 2021-12-03 11:42:28 -06:00
Scott Frederick
ab0cc55e20 Merge branch '2.5.x' into 2.6.x 
Closes gh-28904
 2021-12-03 11:42:03 -06:00
Scott Frederick
467c092fdc Remove classpath index manifest attribute from repackaged war files 
Fixes gh-28895
 2021-12-03 11:41:28 -06:00
Andy Wilkinson
a3ecdcf058 Merge branch '2.6.x' into 2.7.x 
Closes gh-28892
 2021-12-02 10:31:11 +00:00
Andy Wilkinson
4606e17696 Merge branch '2.5.x' into 2.6.x 
Closes gh-28891
 2021-12-02 10:30:51 +00:00
Andy Wilkinson
af60a8a7cf Test our Gradle plugin against Gradle 7.3.1 
Closes gh-28890
 2021-12-02 10:29:22 +00:00
Scott Frederick
5f14cffea3 Add support for CNB platform API 0.5 through 0.8 
Fixes gh-28850
 2021-12-01 14:05:20 -06:00
Andy Wilkinson
86a773a8e9 Update main branch to start work on 2.7.x 2021-11-30 11:16:53 +00:00
Stephane Nicoll
46a8673bf8 Merge branch '2.5.x' 
Closes gh-28839
 2021-11-29 09:44:31 +01:00
Stephane Nicoll
1876b4bcd7 Update copyright year of changed files 
See gh-28809
 2021-11-29 09:43:44 +01:00
Leo Li
f3c93d30a8 Fix reference to matching-strategy property 
See gh-28809
 2021-11-29 09:39:40 +01:00
izeye
c7921468fc Polish 
See gh-28836
 2021-11-29 09:38:07 +01:00
Stephane Nicoll
88aa849f90 Merge branch '2.5.x' 2021-11-29 09:37:31 +01:00
Stephane Nicoll
1bb3f906a7 Polish 
See gh-28836
 2021-11-29 09:35:51 +01:00
Stephane Nicoll
e4082ee5d9 Merge branch '2.5.x' 
Closes gh-28834
 2021-11-28 11:18:57 +01:00
fml2
1d786e49e9 Fix typos in the "External Application Properties" section 
See gh-28830
 2021-11-28 11:17:22 +01:00
Stephane Nicoll
9719930496 Merge branch '2.5.x' 
Closes gh-28833
 2021-11-28 11:14:52 +01:00
Xavier Bouclet
dce979d51f Fix output of "spring --version" in reference documentation 
See gh-28831
 2021-11-28 11:14:14 +01:00
Andy Wilkinson
4bd86a6e20 Allow spring-boot-image-tests to run without an existing snapshot 
Closes gh-28817
 2021-11-26 13:01:34 +00:00
Željko Tomić
1c1c85c3f8 Fix MariaDB mapping for Quartz DataSource initialization 
See gh-28779
 2021-11-25 09:38:44 +01:00
Madhura Bhave
27eb992252 Fix property source ordering in SpringBootTest 
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Closes gh-28804
 2021-11-24 10:29:35 -08:00
Phillip Webb
beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Madhura Bhave
e7ff2cf358 Guard ErrorPageSecurityFilter configuration with ConditionalOnClass 
Update `ErrorPageSecurityFilterConfiguration` to guard against the case
where `spring-security-core` is on the classpath but
`spring-security-web` is not.

Fixes gh-28774
 2021-11-24 10:20:29 -08:00
Madhura Bhave
49e408828c Fix property source ordering in SpringBootTest 
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Fixes gh-28776
 2021-11-24 10:17:02 -08:00
Madhura Bhave
e6b5be900a Make ErrorPageSecurityFilter Servlet 3.1 compatible 
Restore Servlet 3.1 compatibly by implementing `Filter` rather
than extending the 4.0 `HttpFilter` type.

Fixes gh-28790
 2021-11-24 09:59:27 -08:00
Madhura Bhave
f621937d3b Skip error page security filter for non-error dispatch type 
Update `ErrorPageSecurityFilter` to defensively check that the
`DispatcherType` is `ERROR`. Although this check isn't necessary
for regular applications, it is needed if MockMvc is being used.

Fixes gh-28759
 2021-11-24 09:55:59 -08:00
Scott Frederick
4eed637481 Merge branch '2.5.x' 
Closes gh-28789
 2021-11-23 12:45:46 -06:00
Scott Frederick
12244a8edd Remove use of Thymeleaf from smoke tests 
Closes gh-28788
 2021-11-23 12:13:05 -06:00
Andy Wilkinson
03e283a2e6 Mention WebProperties in deprecation of ResourceProperties 
Closes gh-28762
 2021-11-22 10:03:21 +00:00
Yanming Zhou
da2dfbe0aa LettuceMetricsAutoConfiguration should not build ClientResources 
See gh-28767
 2021-11-22 09:49:07 +01:00
Stephane Nicoll
490ec8974d Merge branch '2.5.x' 
Closes gh-28761
 2021-11-20 17:30:35 +01:00
Stephane Nicoll
667bca05ec Polish "Add package info for Spring Data metrics support" 
See gh-28756
 2021-11-20 17:29:52 +01:00
charissathomas
42ae5114ef Create package-info.java 
Closes #28731
 2021-11-20 17:29:22 +01:00
Andy Wilkinson
0074d621d0 Merge branch '2.5.x' 
Closes gh-28754
 2021-11-19 15:37:32 +00:00