Phillip Webb
6dcd2de370
Merge pull request #49695 from kwondh5217
...
* kwondh5217/main:
Add @ConditionalOnWebApplication to NettyReactiveWebServerAutoConfiguration
Closes gh-49695
2026-03-21 14:28:04 -07:00
Daeho Kwon
0b45618cb5
Add @ConditionalOnWebApplication to NettyReactiveWebServerAutoConfiguration
...
See gh-49695
Signed-off-by: Daeho Kwon <trewq231@naver.com >
2026-03-21 14:26:23 -07:00
Phillip Webb
e464348fa4
Merge branch '3.5.x' into 4.0.x
...
Closes gh-49697
2026-03-21 14:22:46 -07:00
Phillip Webb
10df287bbb
Merge pull request #49694 from dlwldnjs1009
...
* jiwon/fix-standard-stack-trace-printer-javadoc:
Fix typos in StandardStackTracePrinter Javadoc
Closes gh-49694
2026-03-21 14:22:08 -07:00
Lee Jiwon
ec167252f2
Fix typos in StandardStackTracePrinter Javadoc
...
See gh-49694
Signed-off-by: Lee Jiwon <dlwldnjs1009@gmail.com >
2026-03-21 14:18:43 -07:00
Andy Wilkinson
6814f6577a
Merge branch '3.5.x' into 4.0.x
...
Closes gh-49683
2026-03-20 13:03:50 +00:00
Andy Wilkinson
f0a02cdbd3
Trigger docs build once release has been promoted
...
Closes gh-49682
2026-03-20 13:01:43 +00:00
Andy Wilkinson
fd5ac05daf
Merge branch '3.5.x' into 4.0.x
...
Closes gh-49680
2026-03-20 12:51:28 +00:00
Andy Wilkinson
aec36b88ef
Upgrade to Antora UI 0.4.26
...
Closes gh-49679
2026-03-20 12:50:35 +00:00
Stéphane Nicoll
25b6de94d5
Fix formatting
2026-03-20 10:29:31 +01:00
Stéphane Nicoll
bf324f3580
Merge branch '3.5.x' into 4.0.x
...
Closes gh-49674
2026-03-20 10:10:27 +01:00
Stéphane Nicoll
060d006f53
Merge pull request #49671 from dependabot[bot]
...
* dependabot/npm_and_yarn/antora/multi-20daa59c70:
Bump fast-xml-parser and @springio/antora-extensions in /antora
Closes gh-49671
2026-03-20 10:10:21 +01:00
dependabot[bot]
be23431bd7
Bump fast-xml-parser and @springio/antora-extensions in /antora
...
Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser ) to 5.5.7 and updates ancestor dependency [@springio/antora-extensions](https://github.com/spring-io/antora-extensions ). These dependencies need to be updated together.
Updates `fast-xml-parser` from 4.5.4 to 5.5.7
- [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases )
- [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md )
- [Commits](https://github.com/NaturalIntelligence/fast-xml-parser/compare/v4.5.4...v5.5.7 )
Updates `@springio/antora-extensions` from 1.14.7 to 1.14.9
- [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc )
- [Commits](https://github.com/spring-io/antora-extensions/compare/v1.14.7...v1.14.9 )
---
updated-dependencies:
- dependency-name: fast-xml-parser
dependency-version: 5.5.7
dependency-type: indirect
- dependency-name: "@springio/antora-extensions"
dependency-version: 1.14.9
dependency-type: direct:production
...
See gh-49671
Signed-off-by: dependabot[bot] <support@github.com >
2026-03-20 10:10:00 +01:00
Stéphane Nicoll
d8ea797aab
Merge branch '3.5.x' into 4.0.x
...
Closes gh-49672
2026-03-20 10:08:40 +01:00
Stéphane Nicoll
8c605ccd94
Merge pull request #49660 from ljrmorgan
...
* graphql_test_should_load_controller_advice:
Polish "Consider ControllerAdvice with @GraphQlTest"
Consider ControllerAdvice with @GraphQlTest
Closes gh-49660
2026-03-20 10:07:51 +01:00
Stéphane Nicoll
af03b3b07c
Polish "Consider ControllerAdvice with @GraphQlTest"
...
See gh-49660
2026-03-20 10:03:05 +01:00
Louis Morgan
264a9aa43a
Consider ControllerAdvice with @GraphQlTest
...
This commit updates the GraphQL slice tests to also consider
`@ControllerAdvice`-annotated beans, since Spring GraphQL loads
`@GraphQlExceptionHandler`s declared in `@ControllerAdvice` beans.
This also aligns `@GraphQlTest` with `@WebMvcTest`.
See gh-49660
Signed-off-by: Louis Morgan <ljrmorgan@gmail.com >
2026-03-20 10:02:07 +01:00
Phillip Webb
dc785720cf
Merge branch '3.5.x' into 4.0.x
2026-03-19 20:16:34 -07:00
Phillip Webb
8b70ee9dbc
Escape format characters when writing changelog
2026-03-19 20:15:45 -07:00
Andy Wilkinson
01170c3273
Merge branch '3.5.x' into 4.0.x
...
Closes gh-49668
2026-03-19 18:30:47 +00:00
Andy Wilkinson
47aa60dc93
Merge pull request #49662 from Joowon-Seo
...
* gh-49662:
Polish "Add boundary tests for JsonValueWriter max nesting depth"
Add boundary tests for JsonValueWriter max nesting depth
Closes gh-49662
2026-03-19 18:29:52 +00:00
Andy Wilkinson
371746826e
Polish "Add boundary tests for JsonValueWriter max nesting depth"
...
See gh-49662
2026-03-19 18:26:28 +00:00
Joowon-Seo
7f0136f8c6
Add boundary tests for JsonValueWriter max nesting depth
...
Verify behavior at the maxNestingDepth boundary.
Signed-off-by: Joowon-Seo <tjwndnjs1998@gmail.com >
See gh-49662
2026-03-19 18:21:06 +00:00
Andy Wilkinson
02e7b35db3
Merge branch '3.5.x' into 4.0.x
2026-03-19 18:06:35 +00:00
Andy Wilkinson
4cd1b02696
Test Gradle plugin against Gradle 9.4.1
...
Closes gh-49667
2026-03-19 18:06:12 +00:00
Andy Wilkinson
7524b32f82
Upgrade to Gradle 9.4.1
...
Closes gh-49665
2026-03-19 18:03:13 +00:00
Moritz Halbritter
501d736a7b
Next development version (v4.0.5-SNAPSHOT)
2026-03-19 11:55:50 +01:00
Moritz Halbritter
79a38504ec
Merge branch '3.5.x' into 4.0.x
2026-03-19 11:52:02 +01:00
Moritz Halbritter
3ebd147508
Next development version (v3.5.13-SNAPSHOT)
2026-03-19 11:50:57 +01:00
Brian Clozel
26edf79084
Merge branch '3.5.x' into 4.0.x
2026-03-19 09:40:05 +01:00
Brian Clozel
6620dea347
Polishing
...
See gh-49645
2026-03-19 09:36:02 +01:00
Moritz Halbritter
7151419752
Upgrade to Testcontainers 2.0.4
...
Closes gh-49655
2026-03-19 09:25:03 +01:00
Stéphane Nicoll
cc6bb61240
Merge branch '3.5.x' into 4.0.x
2026-03-19 07:40:17 +01:00
Stéphane Nicoll
dd54841c4a
Upgrade to Spring Batch 5.2.5
...
Closes gh-49406
2026-03-19 07:40:12 +01:00
Stéphane Nicoll
273942749c
Upgrade to Spring Batch 6.0.3
...
Closes gh-49416
2026-03-18 18:16:39 +01:00
Brian Clozel
a6d8c48e13
Merge branch '3.5.x' into 4.0.x
...
Closes gh-49649
2026-03-18 17:38:12 +01:00
Brian Clozel
1f2ea4a6db
Revisit EndpointRequest matcher for additional paths
...
Prior to this commit, the `EndpointRequest` request matcher generator
would create many, complex matchers for the case of health groups
exposed on additional paths.
This commit revisits the matcher generation and simplifies their
matching to avoid conflicts with other matchers.
Fixes gh-49648
2026-03-18 17:35:22 +01:00
Brian Clozel
1ead08b9d8
Merge branch '3.5.x' into 4.0.x
...
Closes gh-49646
2026-03-18 16:45:57 +01:00
Brian Clozel
01fbede2b2
Handle all requests in CloudFoundry mapping
...
Prior to this commit, the Servlet and Reactive CloudFoundry Actuator
Handler mapping would only handle requests to actual Actuator endpoints.
Here, our original intent has always been to reserve this URL namespace
for the CloudFoundry use case and not delegate to other handler
mappings.
This commit ensures that requests under this path should be processed by
known endpoints, or result in a "HTTP 403 Forbidden" response.
Fixes gh-49645
2026-03-18 16:26:50 +01:00
Moritz Halbritter
07f4f43281
Test against Java 26 GA
...
Closes gh-49642
2026-03-18 14:18:28 +01:00
Stéphane Nicoll
f9e050dac4
Merge branch '3.5.x' into 4.0.x
...
Closes gh-49636
2026-03-18 08:20:51 +01:00
Stéphane Nicoll
dc54595f7a
Merge pull request #49622 from dependabot[bot]
...
* dependabot/npm_and_yarn/antora/springio/asciidoctor-extensions-1.0.0-alpha.18:
Bump @springio/asciidoctor-extensions in /antora
Closes gh-49622
2026-03-18 08:20:40 +01:00
dependabot[bot]
9bc3768814
Bump @springio/asciidoctor-extensions in /antora
...
Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions ) from 1.0.0-alpha.17 to 1.0.0-alpha.18.
- [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc )
- [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.17...v1.0.0-alpha.18 )
---
updated-dependencies:
- dependency-name: "@springio/asciidoctor-extensions"
dependency-version: 1.0.0-alpha.18
dependency-type: direct:production
update-type: version-update:semver-patch
...
See gh-49622
Signed-off-by: dependabot[bot] <support@github.com >
2026-03-18 08:19:42 +01:00
Stéphane Nicoll
804679b1df
Merge branch '3.5.x' into 4.0.x
2026-03-18 07:54:59 +01:00
Stéphane Nicoll
f3d20bbecf
Upgrade to Spring WS 5.0.1
...
Closes gh-49531
2026-03-18 07:50:29 +01:00
Stéphane Nicoll
91ddcff68f
Upgrade to Spring Integration 7.0.4
...
Closes gh-49529
2026-03-18 07:50:29 +01:00
Stéphane Nicoll
dab797eadf
Upgrade to JBoss Logging 3.6.3.Final
...
Closes gh-49632
2026-03-18 07:50:29 +01:00
Stéphane Nicoll
691583437e
Upgrade to Spring WS 4.1.3
...
Closes gh-49528
2026-03-18 07:50:24 +01:00
Stéphane Nicoll
a5db799f8a
Upgrade to Spring Integration 6.5.8
...
Closes gh-49631
2026-03-18 07:50:24 +01:00
Stéphane Nicoll
5ee4ffe567
Upgrade to JBoss Logging 3.6.3.Final
...
Closes gh-49630
2026-03-18 07:50:20 +01:00