Commit Graph
58772 Commits
Author SHA1 Message Date
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
Andy Wilkinson 4d3e374ad1 Merge branch '3.5.x'
Closes gh-48266
2025-11-24 11:30:45 +00:00
Andy Wilkinson a30efc8e0a Merge branch '3.4.x' into 3.5.x
Closes gh-48265
2025-11-24 11:23:22 +00:00
Andy Wilkinson 835199c9e8 Clarify effects of @EnableBatchProcessing
Closes gh-48264
2025-11-24 11:22:50 +00:00
Andy Wilkinson 04ba4120a4 Document need for JdbcDialect bean with Sring Data JDBC and AOT
Closes gh-48240
2025-11-24 10:55:56 +00:00
Maurice Zeijen a39adff3eb Corrected ProblemDetail mixin for XmlMapper.Builder
The ProblemDetailXmlMapperBuilderCustomizer applied the wrong
ProblemDetail mixin for the Jackson XmlMapper. Namely the
ProblemDetailJacksonMixin, which is intended for JSON.
Now the ProblemDetailJacksonXmlMixin is used instead.
The corresponding test also tested for the wrong XML output,
which has been adjusted.

Fixes gh-48222

Signed-off-by: Maurice Zeijen <mzeijen@bol.com>
2025-11-24 09:57:43 +01:00
Stéphane Nicoll 0a4037880c Merge pull request #48255 from michaldo
* pr/48255:
  Document correct replacement for spring.jackson.parser
  Document correct replacement for spring.jackson.generator

Closes gh-48255
2025-11-23 20:03:58 +01:00
Stéphane Nicoll 76cccc5842 Document correct replacement for spring.jackson.parser
See gh-48255
2025-11-23 20:03:33 +01:00
michaldo 6ad521cdfc Document correct replacement for spring.jackson.generator
See gh-48255

Signed-off-by: michaldo <michaldo@github.com>
2025-11-23 20:03:06 +01:00
Stéphane Nicoll c585b05359 Polish
See gh-48239
2025-11-22 10:02:49 +01:00
Phillip Webb a89e89504f Merge branch '3.5.x'
Closes gh-48238
2025-11-21 17:07:40 -08:00
Phillip Webb aae9f47cbc Merge branch '3.4.x' into 3.5.x
Closes gh-48237
2025-11-21 17:07:33 -08:00
Phillip Webb 580ad488f0 Upgrade to Antora Spring UI v0.4.25
Closes gh-48236
2025-11-21 17:06:53 -08:00
Andy Wilkinson 4b8db9b630 Fix problems with auto-configuration architecture checks
Closes gh-48216
2025-11-21 16:57:56 +00:00
Andy Wilkinson 85bbbc99ad Merge branch '3.5.x'
Closes gh-48229
2025-11-21 16:54:25 +00:00
Andy Wilkinson 01d93513c7 Merge branch '3.4.x' into 3.5.x
Closes gh-48226
2025-11-21 16:47:11 +00:00
Andy Wilkinson 40453e76f0 Merge branch '3.5.x'
Closes gh-48228
2025-11-21 16:47:00 +00:00
Andy Wilkinson 7459fe0163 Merge branch '3.4.x' into 3.5.x
Closes gh-48227
2025-11-21 16:46:26 +00:00
Andy Wilkinson 859606ae13 Split architecture checks by language as well as source set
Closes gh-48224
2025-11-21 16:44:54 +00:00
Andy Wilkinson fc8f9a322d Annotation Kotlin auto-config examples with @AutoConfiguration
Closes gh-48220
2025-11-21 16:44:54 +00:00
Stéphane Nicoll bd5264e28e Merge branch '3.5.x'
Closes gh-48219
2025-11-21 13:02:14 +01:00
Stéphane Nicoll d4408ab9cd Merge pull request #48169 from vpavic
* pr/48169:
  Polish "Revise "Use Liquibase for test-only migrations" section"
  Revise "Use Liquibase for test-only migrations" section

Closes gh-48169
2025-11-21 13:02:09 +01:00
Stéphane Nicoll 1650092890 Polish "Revise "Use Liquibase for test-only migrations" section"
See gh-48169
2025-11-21 12:05:42 +01:00