Andy Wilkinson
cb6bd22043
Merge branch '2.6.x'
2021-11-30 12:33:16 +00:00
Andy Wilkinson
86a773a8e9
Update main branch to start work on 2.7.x
2021-11-30 11:16:53 +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
Scott Frederick
12244a8edd
Remove use of Thymeleaf from smoke tests
...
Closes gh-28788
2021-11-23 12:13:05 -06:00
Andy Wilkinson
196c92e12c
Merge branch '2.5.x'
2021-11-22 10:04:24 +00:00
Andy Wilkinson
03e283a2e6
Mention WebProperties in deprecation of ResourceProperties
...
Closes gh-28762
2021-11-22 10:03:21 +00:00
Stephane Nicoll
cdc2851bc1
Merge pull request #28767 from quaff
...
* pr/28767:
LettuceMetricsAutoConfiguration should not build ClientResources
Closes gh-28767
2021-11-22 09:53:10 +01: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
dfc75036ec
Merge pull request #28756 from charissathomas
...
* pr/28756:
Polish "Add package info for Spring Data metrics support"
Create package-info.java
Closes gh-28756
2021-11-20 17:30:24 +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
Phillip Webb
902dd0baf5
Use local docker mirror for test containers
...
See gh-24343
2021-11-19 12:16:12 -08:00
Phillip Webb
10269365c2
Reinstate CI image generation mirrors
...
See gh-25135
2021-11-19 12:15:53 -08:00
Andy Wilkinson
0074d621d0
Merge branch '2.5.x'
...
Closes gh-28754
2021-11-19 15:37:32 +00:00
Andy Wilkinson
015cf920da
Name custom task inputs
...
Closes gh-28753
2021-11-19 15:35:39 +00:00
Andy Wilkinson
258222781a
Merge branch '2.5.x'
...
Closes gh-28752
2021-11-19 14:52:03 +00:00
Andy Wilkinson
96d98a0f6f
Declare dir task inputs with relative path sensitivity
...
Closes gh-28751
2021-11-19 14:29:29 +00:00
Andy Wilkinson
70e42e09c6
Merge branch '2.5.x'
...
Closes gh-28750
2021-11-19 13:43:32 +00:00
Andy Wilkinson
c68e66c63f
Merge pull request #28747 from jprinet
...
* gh-28747:
Upgrade Gradle Enterprise plugin to 3.7.2
Closes gh-28747
2021-11-19 13:43:19 +00:00