Andy Wilkinson
8f3659c147
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28941
2021-12-09 12:44:48 +00:00
Andy Wilkinson
c3e0a7905d
Merge pull request #28902 from Artur-
...
* gh-28902:
Make ErrorPageSecurityFilter compatible with Servlet 3.1
Closes gh-28902
2021-12-09 12:37:02 +00:00
Artur Signell
ad754abba3
Make ErrorPageSecurityFilter compatible with Servlet 3.1
...
See gh-28902
2021-12-09 12:36:35 +00:00
Andy Wilkinson
3b23c542a0
Test servlet 3.1 compatibility in deployment tests
...
Closes gh-28906
2021-12-09 12:24:43 +00: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
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
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
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
Andy Wilkinson
b6135ce919
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28880
2021-12-01 14:39:26 +00:00
Andy Wilkinson
b2a1994f7d
Make clean remove the root build folder
...
Closes gh-28857
2021-12-01 14:38:25 +00:00
Andy Wilkinson
f0f0aa5c46
Merge branch '2.5.x' into 2.6.x
...
See gh-28878
2021-12-01 12:16:37 +00:00
Andy Wilkinson
8322dda8cc
Fix variant selection in spring-boot-maven-plugin
...
See gh-28877
2021-12-01 12:16:14 +00:00
Andy Wilkinson
c7c7592899
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28878
2021-12-01 11:21:04 +00:00
Andy Wilkinson
25bdc097a0
Make poms of all dependencies available in int test repo
...
Closes gh-28877
2021-12-01 11:20:21 +00:00
Andy Wilkinson
9d4375bc12
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28864
2021-11-30 19:26:22 +00:00
Andy Wilkinson
572bd6ca5c
Upgrade to test-retry-gradle-plugin 1.3.1
...
Closes gh-28863
2021-11-30 19:26:09 +00:00
Andy Wilkinson
354a18c9a6
Prepare 2.6.x branch
2021-11-30 10:36:19 +00:00
Scott Frederick
3b12a5efe9
Update system tests for Paketo Java buildpack 6.0.0
...
Paketo Java buildpack version 6.0.0 adds a buildpack and removes
support for the SBOM in the format that the system tests attempt
to verify.
Fixes gh-28823
2021-11-29 12:24:04 -06:00
Spring Builds
4bd6327cac
Next development version (v2.6.2-SNAPSHOT)
2021-11-29 13:10:05 +00:00
Stephane Nicoll
46a8673bf8
Merge branch '2.5.x'
...
Closes gh-28839
2021-11-29 09:44:31 +01:00
Stephane Nicoll
db944600c1
Merge pull request #28809 from polarbear567
...
* pr/28809:
Update copyright year of changed files
Fix reference to matching-strategy property
Closes gh-28809
2021-11-29 09:44:24 +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
Stephane Nicoll
10251c1516
Merge pull request #28836 from izeye
...
* pr/28836:
Polish
Closes gh-28836
2021-11-29 09:38:21 +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
Stephane Nicoll
8d3c545220
Merge pull request #28830 from fml2
...
* pr/28830:
Fix typos in the "External Application Properties" section
Closes gh-28830
2021-11-28 11:18:25 +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
Stephane Nicoll
e4d1718eab
Merge pull request #28831 from mikrethor
...
* pr/28831:
Fix output of "spring --version" in reference documentation
Closes gh-28831
2021-11-28 11:14:46 +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
Stephane Nicoll
cd4d08d8c0
Merge pull request #28779 from ztomic
...
* pr/28779:
Fix MariaDB mapping for Quartz DataSource initialization
Closes gh-28779
2021-11-25 09:43:43 +01:00
Željko Tomić
1c1c85c3f8
Fix MariaDB mapping for Quartz DataSource initialization
...
See gh-28779
2021-11-25 09:38:44 +01:00
Stephane Nicoll
aac6289067
Merge branch '2.5.x'
2021-11-25 09:35:01 +01:00
Stephane Nicoll
bc76756894
Upgrade CI to Docker 20.10.11
...
Closes gh-28806
2021-11-25 09:34:51 +01:00
Stephane Nicoll
74b7098c8d
Upgrade CI to Docker 20.10.11
...
Closes gh-28807
2021-11-25 09:34:08 +01:00
Phillip Webb
82f5d13514
Merge branch '2.5.x'
2021-11-24 10:31:03 -08: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