Commit Graph

28600 Commits

Author SHA1 Message Date
Andy Wilkinson
e87d5d7a41 Merge branch '3.4.x'
Closes gh-45003
2025-04-04 12:10:09 +01:00
Andy Wilkinson
63adda60d7 Merge branch '3.3.x' into 3.4.x
Closes gh-45002
2025-04-04 12:09:00 +01:00
Andy Wilkinson
3e9dddb42c Allow data source class name to be specified when using Hikari
Closes gh-44938
2025-04-04 11:14:47 +01:00
Andy Wilkinson
219c7ed653 Merge branch '3.4.x'
Closes gh-44999
2025-04-04 09:28:16 +01:00
Andy Wilkinson
e107e11bb8 Merge branch '3.3.x' into 3.4.x
Closes gh-44998
2025-04-04 09:28:03 +01:00
Andy Wilkinson
e9fff8150d Avoid triggering NPE in Hikari with null driverClassName
Previously, the post-processing of HikariDataSource to apply custom
connection details would trigger an NPE in Hikari if those details
supplied a null driverClassName.

This commit avoids the problem by only setting the driverClassName
when it is non-null.

Closes gh-44997
2025-04-04 09:14:44 +01:00
Moritz Halbritter
c179fed3b4 Add annotation for registering Servlets and Filters
@ServletRegistration and @FilterRegistration can be used as an
annotation-based alternative to ServletRegistrationBean and
FilterRegistrationBean.

Closes gh-16500
2025-04-04 09:57:52 +02:00
Andy Wilkinson
740fe4b28b Merge branch '3.4.x'
Closes gh-44996
2025-04-04 08:53:42 +01:00
Andy Wilkinson
617f3d525f Merge branch '3.3.x' into 3.4.x
Closes gh-44995
2025-04-04 08:52:45 +01:00
Andy Wilkinson
cae3a92ead Fix NPE with Hikari when DatabaseDriver has null driverClassName
Fixes gh-44994
2025-04-04 08:38:27 +01:00
Phillip Webb
39ef5ae2d5 Merge branch '3.4.x' 2025-04-03 18:06:48 -07:00
Phillip Webb
fc9937d05a Merge branch '3.3.x' into 3.4.x 2025-04-03 18:06:33 -07:00
Phillip Webb
88e8c17369 Update copyright year of changed files 2025-04-03 18:06:14 -07:00
Phillip Webb
bc91c35644 Merge branch '3.4.x'
Closes gh-44993
2025-04-03 18:05:13 -07:00
Phillip Webb
c96835bc9d Merge branch '3.3.x' into 3.4.x
Closes gh-44992
2025-04-03 18:02:57 -07:00
Phillip Webb
f2d367a130 Update 'for removal in' comments since 3.5 will be the last 3.x release
Closes gh-44959
2025-04-03 17:52:22 -07:00
Phillip Webb
455bb0f835 Add ClientHttpRequestFactoryBuilderCustomizer support
Add `ClientHttpRequestFactoryBuilderCustomizer` interface that can be
used to customize the `ClientHttpRequestFactoryBuilder`.

Closes gh-44987
2025-04-03 17:20:11 -07:00
Phillip Webb
983e7b637b Introduce ClientHttpConnectorBuilder support
Add a new `ClientHttpConnectorBuilder` interface to support the
creation of `ClientHttpConnector` instances. The new code is similar
to the `ClientHttpRequestFactoryBuilder` interface that was added to
Spring Boot 3.4.

The `ClientHttpConnectorBuilder` is a functional interface with
additional static factory methods for the various supported
`ClientHttpConnector` types. Each type has it's own builder
which to support client specific customization.

The previous auto-configuration has been relocated to the
`org.springframework.boot.autoconfigure.http.client.reactive`
package and updated to make use of the builder.

Closes gh-43079
2025-04-03 17:05:12 -07:00
Andy Wilkinson
05a9521fde Merge branch '3.4.x'
Closes gh-44977
2025-04-02 13:40:44 +01:00
Andy Wilkinson
d0612f5e0e Merge branch '3.3.x' into 3.4.x
Closes gh-44976
2025-04-02 13:40:33 +01:00
ali-jalaal
48909a432f Add reference to Styra (OPA) Spring Boot SDK
See gh-44951

Signed-off-by: ali-jalaal <4487124+ali-jalaal@users.noreply.github.com>
2025-04-02 13:40:02 +01:00
Andy Wilkinson
b759d1ad9b Polish c604eaeb
See gh-44925
2025-04-02 13:26:46 +01:00
Andy Wilkinson
88e758763e Merge branch '3.4.x'
Closes gh-44975
2025-04-02 11:24:43 +01:00
Andy Wilkinson
703ecef0bf Merge branch '3.3.x' into 3.4.x
Closes gh-44974
2025-04-02 11:24:31 +01:00
Dmytro Nosan
a55f5f0aac Fix CassandraRepositoriesAutoConfigurationTests
Update CassandraRepositoriesAutoConfigurationTests to use the correct
'spring.data.cassandra.repositories.type' property.

See gh-44942

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-04-02 10:45:50 +01:00
Andy Wilkinson
b8e4ec3dc4 Merge branch '3.4.x'
Closes gh-44973
2025-04-02 10:41:33 +01:00
Andy Wilkinson
7630c7c505 Merge branch '3.3.x' into 3.4.x
Closes gh-44972
2025-04-02 10:40:55 +01:00
Johnny Lim
f3d2ab824e Polish
See gh-44949

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-04-02 10:15:36 +01:00
Andy Wilkinson
c604eaeb56 Move spring.mvc.converters.preferred-json-mapper to spring.http
This commit deprecates spring.mvc.converters.preferred-json-mapper
and replaces it with spring.http.converters.preferred-json-mapper.
If both properties are specified, the latter takes precedence.

Closes gh-44925
2025-04-02 09:47:31 +01:00
Andy Wilkinson
f039c73db7 Move spring.codec properties to spring.http.codecs
Closes gh-44925
2025-04-01 20:22:49 +01:00
Andy Wilkinson
5e8812abb1 Merge branch '3.4.x'
Closes gh-44969
2025-04-01 10:33:23 +01:00
Andy Wilkinson
b1fb36bf4b Merge branch '3.3.x' into 3.4.x
Closes gh-44968
2025-04-01 10:31:59 +01:00
Andy Wilkinson
a8381e7cbd Ensure that only spring-core's ReflectionUtils is used
Closes gh-44837
2025-04-01 10:30:58 +01:00
Andy Wilkinson
25ea5901aa Merge branch '3.4.x'
Closes gh-44967
2025-04-01 10:05:44 +01:00
Andy Wilkinson
05f9177abc Merge branch '3.3.x' into 3.4.x
Closes gh-44966
2025-04-01 10:05:34 +01:00
Andy Wilkinson
d07cc59907 Polish security documentation
This commit updates the WebFlux security documentation, primarily to
link to reactive types rather than their Servlet-based equivalents.
It also attempts to clarify when a user details service is
auto-configured.

Closes gh-44955
2025-04-01 10:05:25 +01:00
Moritz Halbritter
88b5ad04e5 Merge branch '3.4.x'
Closes gh-44963
2025-04-01 08:57:09 +02:00
Andreas Ahlenstorf
64843ec2f0 Replace mentions of deprecated MockBean annotation
See gh-44947

Signed-off-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch>
2025-04-01 08:55:22 +02:00
Dmytro Nosan
094c962bbc Add more tests to OpenTelemetryResourceAttributesTests
Add tests for decoding percent-encoded strings with non-ASCII characters
and multi-byte sequences.

See gh-44944

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-04-01 08:49:35 +02:00
Andy Wilkinson
6ad48639c2 Back port 246c4a2 to 3.3.x
The changes do not apply cleanly when cherry-picked so they
have been redone manually.

Closes gh-44941
2025-03-28 16:48:50 +00:00
Andy Wilkinson
67cb738337 Merge branch '3.4.x'
Closes gh-44943
2025-03-28 16:39:17 +00:00
Andy Wilkinson
96ffb2b1a0 Merge branch '3.3.x' into 3.4.x
Closes gh-44940
2025-03-28 16:27:38 +00:00
Andy Wilkinson
bed6ad3c43 Polish UserDetailsServiceAutoConfigurationTests
Closes gh-44939
2025-03-28 16:26:47 +00:00
Andy Wilkinson
2c03989f75 Merge branch '3.4.x'
Closes gh-44937
2025-03-28 14:50:07 +00:00
Andy Wilkinson
16e4449a33 Merge branch '3.3.x' into 3.4.x
Closes gh-44936
2025-03-28 14:49:48 +00:00
Andy Wilkinson
aab929d029 Polish ReactiveUserDetailsServiceAutoConfigurationTests
Closes gh-44934
2025-03-28 14:49:21 +00:00
Andy Wilkinson
2a92c0df1e Address warnings in SSL service connection doc snippets 2025-03-28 09:29:48 +00:00
Andy Wilkinson
1f5df51e36 Merge branch '3.4.x' 2025-03-28 09:10:43 +00:00
Andy Wilkinson
37164603a4 Merge branch '3.3.x' into 3.4.x 2025-03-28 09:10:35 +00:00
Andy Wilkinson
d1345c4d9e Address javadoc warnings in FileWatcherTests 2025-03-28 09:10:19 +00:00