spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-24 18:29:03 +00:00
Code Issues Projects Releases Wiki Activity
62,761 Commits 28 Branches 395 Tags
f61d27d59cdcdeb37f04b613100e8e913d7243c7
Commit Graph
86 Commits
Author SHA1 Message Date
Phillip Webb c96f146f2c Merge branch '4.1.x' 2026-09-15 20:44:43 -07:00
Phillip Webb e45e629145 Merge branch '4.0.x' into 4.1.x 2026-09-15 20:44:24 -07:00
Phillip Webb 9fd0762b3c Fix javadoc empty <p> tag warnings 2026-09-15 20:33:44 -07:00
Andy Wilkinson 2772023050 Merge branch '4.1.x' 
Closes gh-51545
 2026-09-02 14:24:39 +01:00
Andy Wilkinson 8e7128730f Merge branch '4.0.x' into 4.1.x 
Closes gh-51544
 2026-09-02 14:18:14 +01:00
Andy Wilkinson d6c2e687b0 Polish "Use constructor injection in classes that partipate in @Import" 
See gh-51490

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
 2026-09-02 14:16:07 +01:00
Stéphane Nicoll 8588f4b2ea Merge branch '4.1.x' 
Closes gh-51419
 2026-08-24 08:26:53 +02:00
Stéphane Nicoll 4ee67a3f6b Merge branch '4.0.x' into 4.1.x 
Closes gh-51418
 2026-08-24 08:26:06 +02:00
Stéphane Nicoll 43d3cf57eb Close reader in GsonTester 
This harmonizes how JSON marshaller testers operate on a stream. Also
added tests that checks the source is closed as expected for all
implementations.

Closes gh-51417
 2026-08-24 08:21:51 +02:00
Stefano Cordio cb9b32bd22 Add self-reference to ApplicationContextAssertProvider 
See gh-50500

Signed-off-by: Stefano Cordio <stefano.cordio@gmail.com>
 2026-07-15 12:05:23 +02:00
Andy Wilkinson fa371e852e Merge branch '4.0.x' 
Closes gh-50845
 2026-06-24 13:21:35 +01:00
Andy Wilkinson 8715efc615 Polish "Address new warnings from NullAway 0.13.6" 
See gh-50701
 2026-06-24 13:18:32 +01:00
Manu Sridharan 2b7f6f3c69 Address new warnings from NullAway 0.13.6 
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-50701
 2026-06-24 13:16:07 +01:00
Stéphane Nicoll ddb2b8e0eb Merge branch '4.0.x' 2026-05-26 09:29:18 +02:00
Stéphane Nicoll e3bb5cf669 Polish 2026-05-26 09:28:04 +02:00
Stéphane Nicoll 33580421e1 Merge branch '4.0.x' 
Closes gh-50499
 2026-05-25 17:17:10 +02:00
Stéphane Nicoll 86fed81403 Merge branch '3.5.x' into 4.0.x 
Closes gh-50498
 2026-05-25 17:16:59 +02:00
Andy Wilkinson 1a64cac622 Merge branch '4.0.x' 
Closes gh-50270
 2026-05-01 09:34:24 +01:00
Andy Wilkinson 065c463cef Improve nullability of TestPropertyValues 
Closes gh-50269
 2026-05-01 08:39:18 +01:00
Andy Wilkinson 767444c48e Merge branch '4.0.x' 
Closes gh-50013
 2026-04-10 09:56:53 +01:00
Andy Wilkinson 9fdb2db07c Merge branch '3.5.x' into 4.0.x 
Closes gh-50012
 2026-04-10 09:56:33 +01:00
Phillip Webb 9bac152770 Merge branch '4.0.x' 
Closes gh-49737
 2026-03-24 17:39:47 -07:00
Phillip Webb e8ec285fd5 Merge branch '3.5.x' into 4.0.x 
Closes gh-49736
 2026-03-24 17:39:33 -07:00
Andy Wilkinson 9d4500fea6 Merge branch '4.0.x' 
Closes gh-49536
 2026-03-09 17:27:26 +00:00
Andy Wilkinson af774d681f Merge branch '3.5.x' into 4.0.x 
Closes gh-49535
 2026-03-09 17:27:16 +00:00
Andy Wilkinson f90ebbdd0a Merge branch '4.0.x' 
Closes gh-49534
 2026-03-09 17:22:14 +00:00
Andy Wilkinson ace172f8e0 Merge branch '3.5.x' into 4.0.x 
Closes gh-49533
 2026-03-09 17:22:03 +00:00
Andy Wilkinson 0ede2b0e60 Merge branch '4.0.x' 
Closes gh-49517
 2026-03-09 08:58:28 +00:00
Andy Wilkinson a249315be3 Merge branch '3.5.x' into 4.0.x 
Closes gh-49516
 2026-03-09 08:58:18 +00:00
Stéphane Nicoll 6bf72956fd Merge branch '4.0.x' 
Closes gh-49301
 2026-02-23 16:47:29 +01:00
Stéphane Nicoll 5c9dbd4a4d Merge branch '3.5.x' into 4.0.x 
Closes gh-49300
 2026-02-23 16:47:20 +01:00
Andy Wilkinson 7962e86b89 Merge branch '4.0.x' 
Closes gh-49042
 2026-02-03 18:16:11 +00:00
Andy Wilkinson 94fc407e07 Ignore unloadable includes rather than failing 
Fixes gh-48981
 2026-02-03 17:33:21 +00:00
Andy Wilkinson f8f1da605e Merge branch '4.0.x' 
Closes gh-49011
 2026-01-28 14:04:59 +00:00
Andy Wilkinson 5826200520 Delay removal of Jackson 2 support until 4.3.0 at the earliest 
Closes gh-49010
 2026-01-28 13:52:00 +00:00
Andy Wilkinson 84008546c5 Merge branch '4.0.x' 
Closes gh-48991
 2026-01-27 11:27:12 +00:00
Andy Wilkinson 738080946e Improve nullability of TestPropertyValues.Pair 
Fixes gh-48948
 2026-01-27 11:10:56 +00:00
Stéphane Nicoll 1004f5e88d Merge branch '4.0.x' 
Closes gh-48978
 2026-01-27 08:15:43 +01:00
Stéphane Nicoll 7cc58f3f84 Merge branch '3.5.x' into 4.0.x 
Closes gh-48977
 2026-01-27 08:15:28 +01:00
Phillip Webb dad1ca5e95 Merge branch '4.0.x' 2026-01-06 12:54:30 -08:00
Phillip Webb a4f35688aa Merge branch '3.5.x' into 4.0.x 2026-01-06 12:54:11 -08:00
Stéphane Nicoll 82cb083869 Merge branch '4.0.x' 
Closes gh-48683
 2026-01-06 12:36:06 +01:00
Stéphane Nicoll 2e2981bfe4 Merge branch '3.5.x' into 4.0.x 
Closes gh-48682
 2026-01-06 12:35:34 +01:00
Stéphane Nicoll 5399793faf Reinstate Spock support 
Closes gh-48513
 2025-12-19 15:31:59 +01:00
Stefano Cordio b2b0fed285 Decorate all Assert implementations with @CheckReturnValue 
See gh-46766

Signed-off-by: Stefano Cordio <stefano.cordio@gmail.com>
 2025-12-19 10:39:37 +01:00
Phillip Webb da516741b2 Consider modules when deducing WebApplicationType 
Introduce a strategy to `WebApplicationType` to allow modules to
implement deduction logic.

Prior to this commit, modules played no part in deducing the
`WebApplicationType`. This meant that a user with `spring-webflux`
for client purposes would deduce `REACTIVE` despite no
`spring-boot-webflux` module being present.

The following deduction logic order is now implemented:

1) If the `spring-boot-webmvc` module is being used and Spring MVC
   classes are found then `SERVLET` is used.

2) If the `spring-boot-webflux` module is being used and Spring WebFlux
   classes are found then `REACTIVE` is used.

3) If `spring-web` is found and servlet classes are available then
   `SERVLET` is used.

4) If none of the above are satisfied, `NONE` is used.

This commit also updates `SpringBootTestContextBootstrapper` to use
the same deduction logic.

Fixes gh-48517
 2025-12-15 20:30:16 -08:00
Stéphane Nicoll 8eb90644a6 Merge branch '3.5.x' 
Closes gh-48306
 2025-11-26 16:02:42 +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 aceaee89ee Polish "Replace BaseUrl with LocalTestWebServer" 
See gh-47680
 2025-10-21 11:08:48 +02:00
Phillip Webb 41a399c5ae Replace BaseUrl with LocalTestWebServer 
Replace `BaseUrl` and `BaseUrlProvider` provider code with a more
targeted `LocalTestWebServer` class.

The `LocalTestWebServer` can be used to obtain the url of the locally
running server, or provide `UriBuilderFactory` or `UriBuilder`
instances base on it.

This commit also updates the MockMVC HTML Unit auto-configuration to
directly use `localhost` as the base URL.

Closes gh-47680
 2025-10-20 17:44:51 -07:00