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
Stéphane Nicoll
73083c2b51
Upgrade to Kafka 4.1.2
...
See also https://github.com/yawkat/lz4-java/wiki/Gradle-and-org.lz4:lz4%E2%80%90java:1.8.1
Closes gh-49627
2026-03-17 16:00:21 +01:00
Andy Wilkinson
2956d90c9a
Merge branch '3.5.x' into 4.0.x
...
See gh-49607
See gh-49609
2026-03-17 09:13:46 +00:00
Andy Wilkinson
6dab9105af
Roll back JAX-B upgrades and prohibit 4.0.7 of the RI
...
See gh-49615
See gh-49616
2026-03-17 09:11:14 +00:00
Stéphane Nicoll
003a392916
Merge branch '3.5.x' into 4.0.x
2026-03-17 09:43:37 +01:00
Stéphane Nicoll
8769104df6
Upgrade to Spring Pulsar 2.0.4
...
Closes gh-49420
2026-03-17 09:38:16 +01:00
Stéphane Nicoll
04eba1fe65
Upgrade to Spring Kafka 4.0.4
...
Closes gh-49419
2026-03-17 09:38:15 +01:00
Stéphane Nicoll
1754358a85
Upgrade to Spring Pulsar 1.2.16
...
Closes gh-49410
2026-03-17 09:28:38 +01:00
Stéphane Nicoll
f5830536d4
Upgrade to Spring Kafka 3.3.14
...
Closes gh-49409
2026-03-17 09:28:38 +01:00
Stéphane Nicoll
0600810c34
Merge branch '3.5.x' into 4.0.x
2026-03-16 21:10:38 +01:00
Stéphane Nicoll
d04c42d315
Upgrade to Spring Security 6.5.9
...
Closes gh-49527
2026-03-16 21:10:33 +01:00
Stéphane Nicoll
49e5d5bc5b
Upgrade to Spring Security 7.0.4
...
Closes gh-49530
2026-03-16 21:09:04 +01:00
Andy Wilkinson
797253a447
Merge branch '3.5.x' into 4.0.x
...
Closes gh-49617
2026-03-16 18:00:39 +00:00
Andy Wilkinson
22e3646bc3
Merge pull request #49591 from bbbbooo
...
* gh-49591:
Polish "Fix EndpointRequest links matching for separate management port"
Fix EndpointRequest links matching for separate management port
Closes gh-49591
2026-03-16 17:45:54 +00:00
Andy Wilkinson
a148983e7f
Polish "Fix EndpointRequest links matching for separate management port"
...
See gh-49591
Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com >
2026-03-16 17:45:07 +00:00
bbbbooo
79f91eac56
Fix EndpointRequest links matching for separate management port
...
When management.endpoints.web.base-path is empty and management runs
on a different port, EndpointRequest.toLinks() and toAnyEndpoint()
do not match the links endpoint consistently.
Derive the links path based on the management port type on both
servlet and reactive sides, and add regression tests for each
implementation.
See gh-49591
Signed-off-by: bbbbooo <hyeons1213@gmail.com >
2026-03-16 16:39:12 +00:00
Stéphane Nicoll
5896b0cba8
Merge branch '3.5.x' into 4.0.x
2026-03-16 16:04:56 +01:00