Commit Graph
1040 Commits
Author SHA1 Message Date
Stéphane Nicoll dd5fdf7589 Merge branch '4.0.x'
Closes gh-50020
2026-04-10 15:31:32 +02:00
Stéphane Nicoll fdc81ab029 Merge branch '3.5.x' into 4.0.x
Closes gh-50019
2026-04-10 15:31:18 +02:00
Stéphane Nicoll c76b6b8c66 Add lazy JDBC connection fetching for pooled DataSources
This commit allows wrapping the auto-configured pooled DataSource in a
proxy that fetches connections as late as possible. JMX registration of
the underlying pool is preserved.

Closes gh-15480
2026-04-10 15:21:23 +02:00
Andy Wilkinson 783dcb9d97 Merge branch '4.0.x'
Closes gh-50018
2026-04-10 12:37:02 +01:00
Andy Wilkinson cd88bf71f5 Merge branch '3.5.x' into 4.0.x
Closes gh-50017
2026-04-10 12:28:27 +01:00
Andy Wilkinson 3ce5cbfcd8 Merge branch '4.0.x'
Closes gh-49988
2026-04-09 09:01:10 +01:00
Andy Wilkinson 64969bfea8 Ensure that mock infra is defined before Security auto-config
We need to ensure that MockMvcAutoConfiguration has defined its
DispatcherServletPath bean before the condition that checks for it in
ServletWebSecurityAutoConfiguration is evaluated.

Ideally, ServletWebSecurityAutoConfiguration in spring-boot-security
would not know about test-specific code but there's no easy way to
establish the required ordering without this link. One alternative
option is an auto-configuration class in spring-boot-security-test
that's purely for ordering purposes. This was rejected as it would
introduce new public API (as we enforce that all auto-configurations
are public).

Fixes gh-49854
2026-04-09 08:42:36 +01:00
Andy Wilkinson 147be28138 Merge branch '4.0.x'
Closes gh-49957
2026-04-08 09:42:45 +01:00
Andy Wilkinson edcc937add Align FAIL_ON_UNKNOWN_PROPERTIES with Spring Boot 3.x
In Spring Boot 3.x, Jackson2ObjectMapperBuilder disabled
FAIL_ON_UNKNOWN_PROPERTIES. This commit aligns the behavior of
use-jackson2-defaults with this.

This commit also ensures that DEFAULT_VIEW_INCLUSION is disabled. It
was enabled by default in Jackson 2 and then disabled by
Jackson2ObjectMapperBuilder. At the time of writing, Jackson 3's
configureForJackson2() method does not enable DEFAULT_VIEW_INCLUSION.
Should that ever be corrected/changed in Jackson 3, this additional
change in this commit ensures that the Boot will continue to have the
desired default.

Fixes gh-49951
2026-04-08 08:38:32 +01:00
Stéphane Nicoll 08577572a5 Add missing configuration properties for KafkaTemplate
Closes gh-49954
2026-04-08 08:18:26 +02:00
Stéphane Nicoll d16b4ec3c5 Merge branch '4.0.x' 2026-04-08 07:31:39 +02:00
Stéphane Nicoll 308c4317e0 Merge branch '3.5.x' into 4.0.x 2026-04-08 07:31:30 +02:00
Phillip Webb 6f409f7dd6 Polish code for upcoming Spring Security nullability changes
Update code and tests in preparation of upcoming Spring Security
`Nullable` annotation updates.
2026-04-07 22:27:19 -07:00
Phillip Webb e434ee17ca Fix WebFlux test Timezone issue
Fix test that fails in certain timezones.

See gh-8923
2026-04-07 22:20:03 -07:00
Phillip Webb e1dd40a923 Fix test Timezone issue
Fix test that fails in certain timezones.

See gh-8923
2026-04-07 18:03:14 -07:00
Stéphane Nicoll 3062dbdb2e Merge branch '4.0.x'
Closes gh-49947
2026-04-07 17:33:48 +02:00
Stéphane Nicoll d7a475fcd9 Merge branch '3.5.x' into 4.0.x
Closes gh-49946
2026-04-07 17:33:38 +02:00
Brian Clozel f287cd34b8 Merge branch '4.0.x'
Closes gh-49944
2026-04-07 17:09:21 +02:00
Brian Clozel 5c506b148f Merge branch '3.5.x' into 4.0.x
Closes gh-49943
2026-04-07 17:05:52 +02:00
Stéphane Nicoll b103d2bb4c Polish "Add support for configuring a custom SessionTimeout bean"
See gh-49883
2026-04-07 15:08:09 +02:00
Bart Sopers 4cef72b798 Add support for configuring a custom SessionTimeout bean
This commit allows a user-defined SessionTimeout bean to take control
over the auto-configuration of the timeout.

See gh-49883

Signed-off-by: Bart Sopers <15631208+bartsopers@users.noreply.github.com>
2026-04-07 15:04:15 +02:00
Stéphane Nicoll c44336780d Merge branch '4.0.x' 2026-04-07 14:55:17 +02:00
Stéphane Nicoll d93a3f21e9 Polish 2026-04-07 14:50:30 +02:00
Stéphane Nicoll 25150f41de Upgrade to Flyway 12.3.0
Closes gh-49924
2026-04-07 10:48:28 +02:00
Stéphane Nicoll cdbf74fc3a Document missing duration unit in GrpcClientProperties
See gh-49722
Closes gh-49879
2026-04-03 12:33:35 +02:00
Brian Clozel 0acd01d989 Merge branch '4.0.x'
Closes gh-49881
2026-04-03 11:01:36 +02:00
Brian Clozel 3aad18a774 Merge branch '3.5.x' into 4.0.x 2026-04-03 10:56:16 +02:00
Stéphane Nicoll 27b4a3fc34 Merge branch '4.0.x'
Closes gh-49874
2026-04-03 08:43:44 +02:00
Hyeongjun Cho 481efb20cd Fix typo in JdbcSessionAutoConfiguration Javadoc
See gh-49873

Signed-off-by: Hyeongjun Cho <ryuu.public@gmail.com>
2026-04-03 08:40:23 +02:00
Moritz Halbritter 09ece896a5 Merge branch '4.0.x'
Closes gh-49870
2026-04-02 11:16:36 +02:00
Moritz Halbritter d437c11761 Merge branch '3.5.x' into 4.0.x
Closes gh-49869
2026-04-02 11:12:20 +02:00
Moritz Halbritter dc375134f9 Merge branch '4.0.x'
Closes gh-49867
2026-04-02 10:47:07 +02:00
Moritz Halbritter 4f47202910 Merge branch '3.5.x' into 4.0.x
Closes gh-49866
2026-04-02 10:46:26 +02:00
Moritz Halbritter a04b65ea74 Set embeddedValueResolver on WebConversionService
Closes gh-8923
2026-04-02 08:57:22 +02:00
Andy Wilkinson d04cb90d19 Merge branch '4.0.x'
Closes gh-49856
2026-03-31 13:23:00 +01:00
Andy Wilkinson 417107df7a Remove unused dependency on spring-boot-restclient-test
Closes gh-49855
2026-03-31 13:22:50 +01:00
Moritz Halbritter c56cbd46b2 Map OpenTelemetry environment variables to properties
Closes gh-48799
2026-03-30 15:28:42 +02:00
Stéphane Nicoll b089e2148d Adapt Javadoc reference 2026-03-27 17:25:55 +01:00
Stéphane Nicoll 29b03edf6f Do not configure a ReactiveJmtDecoder without spring-webflux
This commit guards the creation of a ReactiveJwtDecoder with the
presence of Spring WebFlux. WebClient is used behind the scenes and
the sole presences of the authorization server and reactive types were
not precise enough.

Closes gh-49807
2026-03-27 11:11:22 +01:00
Stéphane Nicoll 02f3dba12b Merge branch '4.0.x' 2026-03-26 16:08:01 +01:00
Stéphane Nicoll 9105b64025 Merge branch '3.5.x' into 4.0.x 2026-03-26 16:07:44 +01:00
Stéphane Nicoll c747c9c53d Polish "Add configuration for HTML escaping configuration with WebFlux"
See gh-49791
2026-03-26 15:11:36 +01:00
husseinvr97 59f8dca1a4 Add configuration for HTML escaping configuration with WebFlux
See gh-49791

Signed-off-by: husseinvr97 <husseinmustafabas05@gmail.com>
2026-03-26 15:11:19 +01:00
Stéphane Nicoll 5e6b4045a6 Merge branch '4.0.x'
Closes gh-49799
2026-03-26 11:26:08 +01:00
Stéphane Nicoll 30a3fac242 Merge branch '3.5.x' into 4.0.x
Closes gh-49798
2026-03-26 11:25:57 +01:00
Stéphane Nicoll 4d074fcb64 Polish 2026-03-26 10:51:27 +01:00
Stéphane Nicoll d7a4561da8 Harmonize ObservationConvention parameters in gRPC support
Such parameters are usually named "customConvention" so this commit
aligns to that naming.

See gh-49730
2026-03-26 08:38:42 +01:00
Andrey Litvitski f368ac4805 Rename GrpcClientObservationConvention parameter to convention
See gh-49787

Signed-off-by: Andrey Litvitski <andrey1010102008@gmail.com>
2026-03-26 08:33:28 +01:00
Phillip Webb d28cec064e Replace PropertyBasedRequiredBackgroundBootstrapping with exception
Replace `PropertyBasedRequiredBackgroundBootstrapping` with a simpler
`BootstrapExecutorRequiredException` and use a regular failure analyzer
to provide help.

See gh-49733
See gh-49688
2026-03-25 19:19:48 -07:00
Andy Wilkinson 84a156f28a Upgrade to Prometheus Client 1.5.1
Closes gh-49777
2026-03-25 14:04:09 +00:00