Commit Graph
60294 Commits
Author SHA1 Message Date
Stéphane Nicoll 811ddcd1b8 Merge branch '3.5.x'
Closes gh-48336
2025-11-28 16:05:30 +01:00
Stéphane Nicoll 5a20176331 Merge branch '3.4.x' into 3.5.x
Closes gh-48335
2025-11-28 16:04:30 +01:00
Stéphane Nicoll d6dc888e4a Focus examples on TestRestTemplate configuration
Closes gh-48334
2025-11-28 16:03:48 +01:00
Stéphane Nicoll c63dbe7eb8 Document LocalTestWebServer
Closes gh-48333
2025-11-28 15:14:54 +01:00
Stéphane Nicoll e9db595c67 Restore TestRestTemplate#getRootUri
This commit adapts TestRestTemplate#getRootUri to the recently
introduced LocalTestWebServer. The behavior invokes the
UriTemplateHandler to provide the value. If the implementation expands
full URL, then it will provide the expected behavior. If not, it should
return the empty string as before.

Closes gh-48330
2025-11-28 14:44:50 +01:00
Andy Wilkinson c6c6ff0103 Merge branch '3.5.x'
Closes gh-48328
2025-11-28 10:09:05 +00:00
Andy Wilkinson 625abc5282 Merge branch '3.4.x' into 3.5.x
Closes gh-48326
2025-11-28 10:02:36 +00:00
Stéphane Nicoll 542c21869e Review "Creating Your Own Starter" section
Closes gh-48317
2025-11-28 11:00:59 +01:00
Andy Wilkinson 9eab00727d Merge pull request #48320 from youngledo
* gh-48320:
  Set the version to 'unknown' when redis_version is missing

Closes gh-48320
2025-11-28 09:55:15 +00:00
Huang Xiao 2b67bbe07d Set the version to 'unknown' when redis_version is missing
See gh-48320

Signed-off-by: Huang Xiao <youngledo@qq.com>
2025-11-28 09:54:09 +00:00
Andy Wilkinson 7946f0e831 Merge branch '3.5.x'
Closes gh-48325
2025-11-28 09:44:43 +00:00
Andy Wilkinson 7f2ffca789 Merge branch '3.4.x' into 3.5.x
Closes gh-48324
2025-11-28 09:42:28 +00:00
Andy Wilkinson 8becf59d34 Merge pull request #48319 from berry120
* gh-48319:
  Polish "Stop closing parent's MeterRegistry beans when child context closes"
  Stop closing parent's MeterRegistry beans when child context closes

Closes gh-48319
2025-11-28 09:42:10 +00:00
Andy Wilkinson e65baba3a7 Polish "Stop closing parent's MeterRegistry beans when child context closes"
See gh-48319
2025-11-28 09:26:29 +00:00
Michael Berry c89576d14d Stop closing parent's MeterRegistry beans when child context closes
See gh-48319

Signed-off-by: Michael Berry <berry120@gmail.com>
2025-11-28 09:13:19 +00:00
Andy Wilkinson c3e51d32b8 Allow a JwtTypeValidator bean to override Security's default
A change in Spring Security [1] means that type validation is now
performed by default by Spring Security. A breaking side-effect of
this is that setting validateTypes to false no longer has an effect
and the default JwtTypeValidator is still present. Its presence,
wrapped in a DelegatingOAuth2TokenValidator, prevents a user's
JwtTypeValidator bean from being used for type validation.

This commit updates Boot's auto-configuration to change how the
type validators are created. We avoid wrapping in a
DelegatingOAuth2TokenValidator so that the user's custom
JwtTypeValidator can be detected and used in place of the default.
This requires us to create the JwtIssuerValidator rather than using
the createDefaultWithIssuer method as it does not allow additional
validators to be provided.

Fixes gh-48301

[1] https://github.com/spring-projects/spring-security/commit/6d3b54df21ec0cffc30c8b3e0784220bd117a87d
2025-11-27 14:18:10 +00:00
Stéphane Nicoll a5a0ad2ab9 Merge pull request #48274 from Nhahan
* pr/48274:
  Polish "Relax conditions to create HttpService client with RestClient"
  Relax conditions to create HttpService client with RestClient

Closes gh-48274
2025-11-27 09:55:16 +01:00
Stéphane Nicoll 4feb1faf3a Polish "Relax conditions to create HttpService client with RestClient"
See gh-48274
2025-11-27 09:54:50 +01:00
Nhahan a2160f793b Relax conditions to create HttpService client with RestClient
Previously, HttpServiceClientAutoConfiguration used
NotReactiveWebApplicationCondition, which prevented
activation in reactive apps even when virtual threads
were enabled.

This commit removes the condition to follow suite with what was done in
gh-48308

See gh-48274

Signed-off-by: Nhahan <kisy324@naver.com>
2025-11-27 09:54:04 +01:00
Stéphane Nicoll 2336cddb1f Relax conditions to create RestClient infrastructure
Previously, the necessary infrastructure to create a RestClient was only
configured in a servlet-based application or in a reactive application
if virtual threads are enabled.

While this extra care was important in
Spring Boot 4 as the aut-configuration is always available, this is no
longer the case with Spring Boot 4. Indeed, an explicit module has to be
added to the classpath now.

This commit therefore relaxes the condition. If the module has been
added, then the infrastructure is auto-configured.

Closes gh-48308
2025-11-27 09:38:24 +01:00
Andy Wilkinson 46f22b2374 Polish NativeImageRequirementsNotMetException
Closes gh-48307
2025-11-26 15:31:48 +00:00
Stéphane Nicoll 72eaeecd5c Allow other configures to run before PropertiesRestClientHttpServiceGroupConfigurer
Closes gh-48296
2025-11-26 16:06:24 +01:00
Stéphane Nicoll 8eb90644a6 Merge branch '3.5.x'
Closes gh-48306
2025-11-26 16:02:42 +01:00
Stéphane Nicoll 8881d38202 Merge branch '3.4.x' into 3.5.x
Closes gh-48305
2025-11-26 16:00:19 +01:00
Stéphane Nicoll 06055f45a3 Merge pull request #48297 from geopark021
* pr/48297:
  Remove unnecessary cast

Closes gh-48297
2025-11-26 15:59:29 +01:00
geopark021 6b60d89b28 Remove unnecessary cast
Replace explicit casts with pattern variables to improve readability and
remove redundancy.

See gh-48297

Signed-off-by: geopark021 <geobrown021@gmail.com>
2025-11-26 15:55:47 +01:00
Andy Wilkinson b5703eaa4c Merge branch '3.5.x'
Closes gh-48300
2025-11-26 12:43:51 +00:00
Andy Wilkinson bd6049dde6 Merge pull request #48295 from arey
* gh-48295:
  Update references for RestTemplateBuilder and Customizer

Closes gh-48295
2025-11-26 10:58:02 +00:00
Antoine Rey 53a765ac5c Update references for RestTemplateBuilder and Customizer
Starting from Spring Boot 4, the RestTemplateBuilder and
RestTemplateCustomizer classes have been moved from the
org.springframework.boot.web.client package to the
org.springframework.boot.restclient package. This commit updates
the javadoc links in the reference documentation to match

Signed-off-by: Antoine Rey <antoine.rey@free.fr>

See gh-48295
2025-11-26 10:56:29 +00:00
Andy Wilkinson 7b1b834fce Merge branch '3.4.x' into 3.5.x
Closes gh-48299
2025-11-26 10:45:02 +00:00
Andy Wilkinson 710e567ba5 Check javadoc macros in adoc files
Closes gh-48298
2025-11-26 10:41:49 +00:00
Andy Wilkinson cf1ecca81c Add missing spring-boot-restclient for Docker-based test
See gh-48253
2025-11-25 15:30:48 +00:00
Andy Wilkinson 3e82ede609 Require spring-boot-restclient dependency to use TestRestTemplate
Previously, spring-boot-restclient was a required dependency of
spring-boot-resttestclient. This had the unwanted side-effect of
increasing the risk of the test classpath enabling auto-configuration
for RestClient.Builder when it was main code that needed such a bean.
This could lead to integration tests passing but the application
itself failing to start when its run through its main method.

This commit makes spring-boot-restclient an optional dependency of
spring-boot-resttestclient. As a result, a dependency on
spring-boot-resttestclient is no longer sufficient to auto-configure
a RestClient.Builder bean, although it is still sufficient to
auto-configure a RestTestClient bean.

Those that wish to use TestRestTemplate rather than migrating to
RestTestClient will now have to add a dependency on
spring-boot-restclient. This makes it presence more obvious. It now
has to be declared directly rather than being somewhat hidden due to
being pulled in transitively. The hope is that this will reduce the
chances of the dependency being accidentially on the test classpath
when main code requires it to be on the runtime classpath.

Fixes gh-48253
2025-11-25 14:38:33 +00:00
Stéphane Nicoll 0e56cd08ea Fix inconsistency in Graceful Shutdown section
See gh-46917
Closes gh-48284
2025-11-25 11:19:19 +01:00
Stéphane Nicoll f6a2cae2bb Merge branch '3.5.x'
Closes gh-48283
2025-11-25 10:01:24 +01:00
Stéphane Nicoll e3af93f0f7 Merge pull request #48282 from banseok1216
* pr/48282:
  Polish "Fix typo in ContextPairs"
  Fix typo in ContextPairs

Closes gh-48282
2025-11-25 10:00:58 +01:00
Stéphane Nicoll 0b6303abc8 Polish "Fix typo in ContextPairs"
See gh-48282
2025-11-25 09:57:18 +01:00
banseok1216 b6fa57d671 Fix typo in ContextPairs
Changed 'delimeter' to 'delimiter' in the method parameter name and its
usage.

See gh-48282

Signed-off-by: banseok1216 <bansuk1216@naver.com>
2025-11-25 09:57:03 +01:00
Stéphane Nicoll 846c154b1d Merge pull request #48278 from igslznev
* pr/48278:
  Polish "Document that spring-boot-h2console is required"
  Document that spring-boot-h2console is required

Closes gh-48278
2025-11-25 09:53:02 +01:00
Stéphane Nicoll 0cc2e57461 Polish "Document that spring-boot-h2console is required"
We can simplify the original proposal as spring-boot-h2console brings
H2 if needed.

See gh-48278
2025-11-25 09:51:21 +01:00
Igor 5ea290ae11 Document that spring-boot-h2console is required
See gh-48278

Signed-off-by: Igor <i.y.seleznov@gmail.com>
2025-11-25 09:50:56 +01:00
Stéphane Nicoll f7f11a4f25 Merge branch '3.5.x'
Closes gh-48275
2025-11-24 16:47:49 +01:00
Stéphane Nicoll ae3408f285 Detect JDK25-style main method in SpringBootTest
This commit adapts SpringBootTest when it has to use a main method to
detect package private main method as well as main methods that do not
have any arguments.

Closes gh-48271
2025-11-24 16:45:57 +01:00
Stéphane Nicoll 949c227698 Restore ApplicationServletEnvironment in web deployments
Closes gh-48254
2025-11-24 15:34:05 +01:00
Stéphane Nicoll 709e19f708 Test ApplicationServetEnvironment is configured in web environments
See gh-48254
2025-11-24 15:32:09 +01:00
Andy Wilkinson 635e331587 Mention using AutoConfigureRestTestClient in a WebMvcTest
Closes gh-47948
2025-11-24 14:15:38 +00:00
Andy Wilkinson 5f52a77480 Merge branch '3.5.x'
Closes gh-48269
2025-11-24 12:04:40 +00:00
Andy Wilkinson b72628c0ff Merge branch '3.4.x' into 3.5.x
Closes gh-48268
2025-11-24 12:03:20 +00:00
Andy Wilkinson 780b412415 Upgrade to actions/checkout@v6
Closes gh-48267
2025-11-24 12:02:29 +00:00
Andy Wilkinson 1761ff0ff4 Clarify Batch docs on the need for a DataSource and DB-based repository
Closes gh-48233
2025-11-24 11:41:17 +00:00