Commit Graph

28579 Commits

Author SHA1 Message Date
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
Dmytro Nosan
f312c9083b Add test for 'force' async mode with @Primary custom executor
See gh-44921

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-28 07:19:41 +01:00
Andy Wilkinson
e5a05ec7da Merge branch '3.4.x'
Closes gh-44923
2025-03-27 20:00:22 +00:00
Andy Wilkinson
6fde9dc49b Merge branch '3.3.x' into 3.4.x
Closes gh-44922
2025-03-27 20:00:05 +00:00
Andy Wilkinson
7b29e6535d Move ErrorAttributesOptionsTests to correct package
Closes gh-44920
2025-03-27 19:52:44 +00:00
Stéphane Nicoll
ab1b3104bb Polish "Allow configuring a TaskExecutor even if an Executor is present"
See gh-44659
2025-03-27 15:02:34 +01:00
Stéphane Nicoll
13bd61445b Allow configuring a TaskExecutor even if an Executor is present
This commit updates `TaskExecutionAutoConfiguration` to permit the
auto-configuration of a `TaskExecutor` even if a user-defined `Executor`
bean is present.

Such `Executor` may have been created for totally unrelated reason, and
it may or may not be an `AsyncTaskExecutor`. The default behavior has
not changed, but this commit provides a new property,
`spring.task.execution.mode` that can be set to `force` to
auto-configure the `TaskExecutor` anyway.

Because this mode made it so that two `Executor` will be present in the
context, this commit also automatically configures an `AsyncConfigurer`
if none is present already to make sure task processing uses the
auto-configured TaskExecutor.

Closes gh-44659
2025-03-26 16:27:21 +01:00
Stéphane Nicoll
ac550945fe Merge branch '3.4.x'
Closes gh-44909
2025-03-26 16:10:57 +01:00
Stéphane Nicoll
44dbf1a71b Merge branch '3.3.x' into 3.4.x
Closes gh-44908
2025-03-26 16:10:48 +01:00
Stéphane Nicoll
dd1ac616f3 Clarify the behavior if multiple Executor beans are present
Closes gh-44907
2025-03-26 16:06:06 +01:00
Yanming Zhou
4e1fa66420 Add 'spring.kafka.consumer.max-poll-interval' configuration property
See gh-44901

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-26 12:04:57 +01:00
Moritz Halbritter
f36d9a921a Polish "Add OTLP span exporter builder customizers"
See gh-44900
2025-03-26 12:00:36 +01:00
Dmytro Nosan
19004e028b Add OTLP span exporter builder customizers
This commit adds customizers for both OtlpHttpSpanExporterBuilder
and OtlpGrpcSpanExporterBuilder.

See gh-44900

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-26 12:00:36 +01:00
Andy Wilkinson
49db6dd276 Merge branch '3.4.x'
Closes gh-44904
2025-03-26 10:58:32 +00:00
Andy Wilkinson
056429a65c Merge branch '3.3.x' into 3.4.x
Closes gh-44903
2025-03-26 10:55:53 +00:00
Andy Wilkinson
2f7d598f41 Check imported boms for unwanted dependency management
Closes gh-42523
2025-03-26 10:52:30 +00:00
Moritz Halbritter
b8928ef686 Merge branch '3.4.x'
Closes gh-44902
2025-03-26 10:31:23 +01:00
Dmytro Nosan
48b7467d38 Add tests for OtlpTracingAutoConfiguration
See gh-44789

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-26 10:25:58 +01:00
Johnny Lim
b8bd65ca8e Remove extra ".0" in prohibit.versionRange for jOOQ
See gh-44877

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-03-26 09:22:34 +01:00
Andy Wilkinson
0ea2775f23 Merge branch '3.4.x'
Closes gh-44896
2025-03-25 17:54:08 +00:00
Andy Wilkinson
d78a208730 Merge branch '3.3.x' into 3.4.x
Closes gh-44895
2025-03-25 17:53:53 +00:00
Andy Wilkinson
95d89fba94 Remove no-longer-used effective bom artifact
Closes gh-44894
2025-03-25 17:53:23 +00:00