Phillip Webb
4034725e38
Skip forward merge checks on docs-build branch
2025-04-03 14:39:43 -07:00
Andy Wilkinson
05a9521fde
Merge branch '3.4.x'
...
Closes gh-44977
2025-04-02 13:40:44 +01:00
Andy Wilkinson
d0612f5e0e
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44976
2025-04-02 13:40:33 +01:00
Andy Wilkinson
47ace6d49a
Merge pull request #44951 from ali-jalaal
...
* gh-44951:
Add reference to Styra (OPA) Spring Boot SDK
Closes gh-44951
2025-04-02 13:40:26 +01:00
ali-jalaal
48909a432f
Add reference to Styra (OPA) Spring Boot SDK
...
See gh-44951
Signed-off-by: ali-jalaal <4487124+ali-jalaal@users.noreply.github.com >
2025-04-02 13:40:02 +01:00
Andy Wilkinson
b759d1ad9b
Polish c604eaeb
...
See gh-44925
2025-04-02 13:26:46 +01:00
Andy Wilkinson
88e758763e
Merge branch '3.4.x'
...
Closes gh-44975
2025-04-02 11:24:43 +01:00
Andy Wilkinson
703ecef0bf
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44974
2025-04-02 11:24:31 +01:00
Andy Wilkinson
d36876752f
Merge pull request #44942 from nosan
...
* gh-44942:
Fix CassandraRepositoriesAutoConfigurationTests
Closes gh-44942
2025-04-02 11:24:24 +01:00
Dmytro Nosan
a55f5f0aac
Fix CassandraRepositoriesAutoConfigurationTests
...
Update CassandraRepositoriesAutoConfigurationTests to use the correct
'spring.data.cassandra.repositories.type' property.
See gh-44942
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com >
2025-04-02 10:45:50 +01:00
Andy Wilkinson
b8e4ec3dc4
Merge branch '3.4.x'
...
Closes gh-44973
2025-04-02 10:41:33 +01:00
Andy Wilkinson
7630c7c505
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44972
2025-04-02 10:40:55 +01:00
Andy Wilkinson
f2f0b0cbcf
Merge pull request #44949 from izeye
...
* gh-44949:
Polish
Closes gh-44949
2025-04-02 10:16:15 +01:00
Johnny Lim
f3d2ab824e
Polish
...
See gh-44949
Signed-off-by: Johnny Lim <izeye@naver.com >
2025-04-02 10:15:36 +01:00
Andy Wilkinson
c604eaeb56
Move spring.mvc.converters.preferred-json-mapper to spring.http
...
This commit deprecates spring.mvc.converters.preferred-json-mapper
and replaces it with spring.http.converters.preferred-json-mapper.
If both properties are specified, the latter takes precedence.
Closes gh-44925
2025-04-02 09:47:31 +01:00
Andy Wilkinson
f039c73db7
Move spring.codec properties to spring.http.codecs
...
Closes gh-44925
2025-04-01 20:22:49 +01:00
Andy Wilkinson
5e8812abb1
Merge branch '3.4.x'
...
Closes gh-44969
2025-04-01 10:33:23 +01:00
Andy Wilkinson
b1fb36bf4b
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44968
2025-04-01 10:31:59 +01:00
Andy Wilkinson
a8381e7cbd
Ensure that only spring-core's ReflectionUtils is used
...
Closes gh-44837
2025-04-01 10:30:58 +01:00
Andy Wilkinson
25ea5901aa
Merge branch '3.4.x'
...
Closes gh-44967
2025-04-01 10:05:44 +01:00
Andy Wilkinson
05f9177abc
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44966
2025-04-01 10:05:34 +01:00
Andy Wilkinson
d07cc59907
Polish security documentation
...
This commit updates the WebFlux security documentation, primarily to
link to reactive types rather than their Servlet-based equivalents.
It also attempts to clarify when a user details service is
auto-configured.
Closes gh-44955
2025-04-01 10:05:25 +01:00
Moritz Halbritter
88b5ad04e5
Merge branch '3.4.x'
...
Closes gh-44963
2025-04-01 08:57:09 +02:00
Moritz Halbritter
b0fb9f9c66
Merge pull request #44947 from aahlenst
...
* pr/44947:
Replace mentions of deprecated MockBean annotation
Closes gh-44947
2025-04-01 08:57:01 +02:00
Andreas Ahlenstorf
64843ec2f0
Replace mentions of deprecated MockBean annotation
...
See gh-44947
Signed-off-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch >
2025-04-01 08:55:22 +02:00
Moritz Halbritter
4f6a99a214
Merge pull request #44944 from nosan
...
* pr/44944:
Add more tests to OpenTelemetryResourceAttributesTests
Closes gh-44944
2025-04-01 08:52:22 +02:00
Dmytro Nosan
094c962bbc
Add more tests to OpenTelemetryResourceAttributesTests
...
Add tests for decoding percent-encoded strings with non-ASCII characters
and multi-byte sequences.
See gh-44944
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com >
2025-04-01 08:49:35 +02:00
Moritz Halbritter
db3208460d
Merge branch '3.4.x'
...
Closes gh-44961
2025-04-01 08:43:17 +02:00
Moritz Halbritter
8eb2da3aa1
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44960
2025-04-01 08:42:29 +02:00
Moritz Halbritter
b381fb1c39
Merge pull request #44957 from dependabot[bot]
...
* pr/44957:
Polish "Bump gradle/actions from 4.3.0 to 4.3.1"
Bump gradle/actions from 4.3.0 to 4.3.1
Closes gh-44957
2025-04-01 08:42:12 +02:00
Moritz Halbritter
4686dafabf
Polish "Bump gradle/actions from 4.3.0 to 4.3.1"
...
See gh-44957
2025-04-01 08:41:50 +02:00
dependabot[bot]
ccc36098f2
Bump gradle/actions from 4.3.0 to 4.3.1
...
Bumps [gradle/actions](https://github.com/gradle/actions ) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/gradle/actions/releases )
- [Commits](94baf225fe...06832c7b30 )
---
updated-dependencies:
- dependency-name: gradle/actions
dependency-type: direct:production
update-type: version-update:semver-patch
...
See gh-44957
Signed-off-by: dependabot[bot] <support@github.com >
2025-04-01 08:41:20 +02:00
Andy Wilkinson
faef7d525c
Merge branch '3.4.x'
2025-03-28 16:50:03 +00:00
Andy Wilkinson
2661757a1a
Merge branch '3.3.x' into 3.4.x
2025-03-28 16:49:48 +00:00
Andy Wilkinson
6ad48639c2
Back port 246c4a2 to 3.3.x
...
The changes do not apply cleanly when cherry-picked so they
have been redone manually.
Closes gh-44941
2025-03-28 16:48:50 +00:00
Andy Wilkinson
67cb738337
Merge branch '3.4.x'
...
Closes gh-44943
2025-03-28 16:39:17 +00:00
Andy Wilkinson
96ffb2b1a0
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44940
2025-03-28 16:27:38 +00:00
Andy Wilkinson
bed6ad3c43
Polish UserDetailsServiceAutoConfigurationTests
...
Closes gh-44939
2025-03-28 16:26:47 +00:00
Andy Wilkinson
2c03989f75
Merge branch '3.4.x'
...
Closes gh-44937
2025-03-28 14:50:07 +00:00
Andy Wilkinson
16e4449a33
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44936
2025-03-28 14:49:48 +00:00
Andy Wilkinson
aab929d029
Polish ReactiveUserDetailsServiceAutoConfigurationTests
...
Closes gh-44934
2025-03-28 14:49:21 +00:00
Moritz Halbritter
f573f19aa5
Fix race condition in SampleQuartzApplicationWebTests
2025-03-28 14:16:46 +01:00
Andy Wilkinson
2a92c0df1e
Address warnings in SSL service connection doc snippets
2025-03-28 09:29:48 +00:00
Andy Wilkinson
1f5df51e36
Merge branch '3.4.x'
2025-03-28 09:10:43 +00:00
Andy Wilkinson
37164603a4
Merge branch '3.3.x' into 3.4.x
2025-03-28 09:10:35 +00:00
Andy Wilkinson
d1345c4d9e
Address javadoc warnings in FileWatcherTests
2025-03-28 09:10:19 +00:00
Stéphane Nicoll
4fadad49a7
Merge pull request #44921 from nosan
...
* pr/44921:
Add test for 'force' async mode with @Primary custom executor
Closes gh-44921
2025-03-28 07:25:39 +01:00
Dmytro Nosan
f312c9083b
Add test for 'force' async mode with @Primary custom executor
...
See gh-44921
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com >
2025-03-28 07:19:41 +01:00
Andy Wilkinson
e5a05ec7da
Merge branch '3.4.x'
...
Closes gh-44923
2025-03-27 20:00:22 +00:00
Andy Wilkinson
6fde9dc49b
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44922
2025-03-27 20:00:05 +00:00