Commit Graph
59190 Commits
Author SHA1 Message Date
Tran Ngoc Nhan 7c03d3ad07 Remove duplicate word
See gh-48874

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-01-17 20:10:28 +01:00
Andy Wilkinson e579b8be98 Upgrade to Spring Data Bom 2025.1.2
Closes gh-48716
2026-01-16 16:09:39 +00:00
Andy Wilkinson 6ce5cae7a6 Merge branch '3.5.x' into 4.0.x 2026-01-16 16:08:50 +00:00
Andy Wilkinson 30bfdac357 Upgrade to Spring Data Bom 2025.0.8
Closes gh-48708
2026-01-16 16:08:27 +00:00
Andy Wilkinson 9c3c008f50 Merge branch '3.5.x' into 4.0.x
Closes gh-48866
2026-01-16 14:55:24 +00:00
Andy Wilkinson aaf482dfd4 Automate inclusion of noteworthy changes in the changelog
Closes gh-48656
2026-01-16 14:54:55 +00:00
Andy Wilkinson 9aa4965823 Merge branch '3.5.x' into 4.0.x 2026-01-16 08:53:14 +00:00
Andy Wilkinson e5fd82855a Upgrade to Undertow 2.3.21.Final
Closes gh-48848
2026-01-16 07:33:21 +00:00
Andy Wilkinson 7bd53c7ba2 Upgrade to R2DBC MSSQL 1.0.4.RELEASE
Closes gh-48847
2026-01-16 07:32:09 +00:00
Andy Wilkinson 3ea6db0a56 Upgrade to Micrometer Tracing 1.5.8
Closes gh-48706
2026-01-16 07:32:09 +00:00
Andy Wilkinson 8152bd0292 Upgrade to Micrometer 1.15.8
Closes gh-48705
2026-01-16 07:32:09 +00:00
Phillip Webb ea564d21e0 Ensure that the session same site defaults to "lax"
Remove the `always()` call from the same site mapping and replace `as`
with a direct call. This update means that mapping only occurs when
`getSameSite` is not `null`, but mapping can still be applied if
`sameSite.getAttributeValue()` returns `null`.

Closes gh-48830
2026-01-15 17:36:56 -08:00
Phillip Webb 5d2373eab8 Merge branch '3.5.x' into 4.0.x 2026-01-15 17:33:45 -08:00
Andy Wilkinson b497bf3ea5 Test that the session same site defaults to "lax"
See gh-48830
2026-01-15 17:31:18 -08:00
Andy Wilkinson 6ba3ac3d7b Upgrade to Lettuce 6.8.2.RELEASE
Closes gh-48859
2026-01-15 17:48:38 +00:00
Andy Wilkinson 50d3381fb5 Upgrade to Spring HATEOAS 3.0.2
Closes gh-48834
2026-01-15 15:36:17 +00:00
Andy Wilkinson 5e9bd08fea Upgrade to Spring Framework 7.0.3
Closes gh-48717
2026-01-15 15:36:17 +00:00
Andy Wilkinson 0fb395ae1d Upgrade to R2DBC MSSQL 1.0.4.RELEASE
Closes gh-48858
2026-01-15 15:36:17 +00:00
Andy Wilkinson 3100599005 Upgrade to Hibernate 7.2.1.Final
Closes gh-48857
2026-01-15 15:36:17 +00:00
Andy Wilkinson 625571c3d1 Fix MVC and WebFlux validator creation in a native image
Following modularization, a presence check for ValidatorAdapter was
needed in the MVC and WebFlux auto-configuratiomn when creating
their Validators. Runtime hints to allow this check to work in a
native image were not added at the same time, resulting in the
class appearing to be absent. This caused message interpolation
for constraint violations to fail as newly created Validator was
being used which lacked the necessary MessageInterpolator
configuration.

This commit adds reflection hints for ValidatorAdapter, allowing
re-use of the context's main validator as the MVC and WebFlux
validators.

Fixes gh-48828
2026-01-15 14:12:33 +00:00
Andy Wilkinson e8cea82772 Don't require …TestAutoConfiguration classes in imports file
See gh-48822
2026-01-15 12:01:46 +00:00
Andy Wilkinson bd4c43bf53 Make s-b-restclient test autoconfigs package-private
Fixes gh-48820
2026-01-15 11:54:57 +00:00
Andy Wilkinson bd96079565 Merge pull request #48829 from mspiess
* gh-48829:
  Move schema.graphqls into test module

Closes gh-48829
2026-01-15 11:22:11 +00:00
mspiess ce20e1ed20 Move schema.graphqls into test module
Spring Projects that have the `spring.graphql.schema.locations` property
set to `"classpath*:graphql/**/"` as suggested in the documentation have
failing GraphQL tests after upgrading to Spring Boot 4.
The `Query` type definition in the books-domain schema clashes with the
schema of the application. Presumably the books-domain schema was never
meant to exist in the exported JAR file. This commit moves it into the
test module to stop it from being exported and causing problems.

Signed-off-by: mspiess <30656914+mspiess@users.noreply.github.com>

See gh-48829
2026-01-15 11:20:54 +00:00
Andy Wilkinson 8b3ef3b28b Merge branch '3.5.x' into 4.0.x
Closes gh-48840
2026-01-15 11:10:52 +00:00
Andy Wilkinson 73bf5f3d20 Avoid querying BeanFactory for beans of type ResolvableType.NONE
ResolvableType.NONE represents a type that does not exist and,
therefore could not be loaded. A bean of such a type cannot be
present in the BeanFactory so querying it for beans of that type
is pointless.

This commit updates OnBeanCondition to return immediately rather
than querying the BeanFactory by type for beans that we know cannot
be present.

Fixes gh-48836
2026-01-15 11:08:59 +00:00
Andy Wilkinson 774dd9e1de Merge branch '3.5.x' into 4.0.x
Closes gh-48838
2026-01-15 10:50:08 +00:00
Andy Wilkinson 2dabe09363 Avoid losing type information in on bean condition messages
Previously, a type in a bean condition was handled as a
ResolvableType. When the type was not present on the classpath
it would be represented as ResolvableType.NONE which renders as ?.
This resulted in some type information being omitted from the
condition evaluation report.

This commit introduces a pair, ByteType, the holds both the name of
the type as a String as well as the ResolvableType that represents
it. When that ResolvableType is NONE, the String name of the type
is used thereby avoiding the information loss.

Fixes gh-48835
2026-01-15 10:33:31 +00:00
Andy Wilkinson a5ca146aa0 Start building against Spring HATEOAS 3.0.2 snapshots
See gh-48834
2026-01-15 09:43:03 +00:00
Andy Wilkinson 574296487a Start building against Spring Integration 7.0.2 snapshots
See gh-48833
2026-01-15 09:18:44 +00:00
Andy Wilkinson 1e5ad075df Start building against Spring AMQP 4.0.2 snapshots
See gh-48832
2026-01-15 09:18:39 +00:00
Andy Wilkinson 7af147d091 Fix CloudFoundry actuator auto-config in absence of RestTemplateBuilder
Previously, CloudFoundryActuatorAutoConfiguration required
RestTemplateBuilder, using it to create the RestTemplate that's used
the security interceptor. Following the modularization,
RestTemplateBuilder is only present when spring-boot-restclient is on
the classpath. In its absence, CloudFoundryActuatorAutoConfiguration
would fail.

This commit address this problem by using RestClient.Builder (and
RestClient) instead of RestTemplateBuilder (and RestTemplate). This
allows CloudFoundryActuatorAutoConfiguration to work without
spring-boot-restclient as RestClient.Builder and RestClient are
provided by spring-web that will always be there in an MVC webapp.

Fixes gh-48826
2026-01-14 15:45:08 +00:00
Andy Wilkinson 5332ed4321 Correct reference to Cloud Foundry starter
See gh-48675
2026-01-14 14:10:04 +00:00
Andy Wilkinson e51fb2f8f0 Merge branch '3.5.x' into 4.0.x
Closes gh-48822
Fixes gh-48819
2026-01-14 11:25:01 +00:00
Andy Wilkinson d60158ceb7 Check that auto-configuration classes are listed in imports file
Closes gh-48821
2026-01-14 11:19:46 +00:00
Andy Wilkinson 284bc1aa25 Upgrade to Reactor Bom 2025.0.2
Closes gh-48714
2026-01-13 17:06:30 +00:00
Andy Wilkinson 61b29cb8bf Upgrade to Micrometer Tracing 1.6.2
Closes gh-48713
2026-01-13 17:06:30 +00:00
Andy Wilkinson 6ec393499a Upgrade to Micrometer 1.16.2
Closes gh-48712
2026-01-13 17:06:29 +00:00
Andy Wilkinson 4298d9bd93 Merge branch '3.5.x' into 4.0.x 2026-01-13 17:00:49 +00:00
Andy Wilkinson 2ee3aee85b Upgrade to Reactor Bom 2024.0.14
Closes gh-48707
2026-01-13 17:00:40 +00:00
Andy Wilkinson 90df993c74 Merge branch '3.5.x' into 4.0.x
Closes gh-48812
2026-01-13 16:52:51 +00:00
Andy Wilkinson d9fa9353aa Prevent VirtualThreadSchedulerMXBean problems from breaking /info
At the time of writing, VirtualThreadSchedulerMXBean does not work in
a GraalVM native image (oracle/graal#12802). An attempt to retrieve
the MXBean results in an IllegalArgumentException being thrown. This
causes a failure when serializing ProcessInfo to JSON, breaking the
Actuator's info endpoint when management.info.process.enabled=true.

This commit updates ProcessInfo to be more defensive when working
with the MXBean. Now, if any exception is thrown, null will be
returned for the virtual threads info. This approach should allow the
functionality to work whenever a fix is made in Graal without
requiring further changes in Boot.

Fixes gh-48810
2026-01-13 16:33:39 +00:00
Andy Wilkinson 6fcb7d270a Merge branch '3.5.x' into 4.0.x 2026-01-13 12:08:17 +00:00
Andy Wilkinson 9ee07c3f4b Adapt to breaking change in Spring Data Neo4j
This is a follow-on from 9239447.

A recent change [1] in Spring Data Neo4j require us to configure the
use of an older dialect as we're testing with Neo4j 4 and the default
dialect now requires Neo4j 5.

See gh-48708

[1] https://github.com/spring-projects/spring-data-neo4j/commit/f2d7ba731416dc0c03d791839fd88335649a2dcc
2026-01-13 12:06:57 +00:00
Andy Wilkinson 5d89b9919a Merge branch '3.5.x' into 4.0.x 2026-01-13 09:38:51 +00:00
Andy Wilkinson 9239447662 Adapt to breaking change in Spring Data Neo4j
A recent change [1] in Spring Data Neo4j require us to configure the
use of an older dialect as we're testing with Neo4j 4 and the default
is now Neo4j 5.

See gh-48708

[1] https://github.com/spring-projects/spring-data-neo4j/commit/f2d7ba731416dc0c03d791839fd88335649a2dcc
2026-01-13 09:36:10 +00:00
Moritz Halbritter 08082aa4c8 Merge branch '3.5.x' into 4.0.x
Closes gh-48806
2026-01-13 09:10:43 +01:00
Moritz Halbritter 46a0f48a97 Document the Docker Compose argument properties
Closes gh-48657
2026-01-13 09:10:06 +01:00
Andy Wilkinson 50e7c02986 Correct links to EnvironmentPostProcessor javadoc
Closes gh-48803
2026-01-13 07:28:30 +00:00
Andy Wilkinson abd0d2903e Update docs to reflect new location of CF actuator support
Closes gh-48675
2026-01-12 08:22:11 +00:00