Commit Graph

53789 Commits

Author SHA1 Message Date
Stéphane Nicoll
4fadad49a7 Merge pull request #44921 from nosan
* pr/44921:
  Add test for 'force' async mode with @Primary custom executor

Closes gh-44921
2025-03-28 07:25:39 +01: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
Andy Wilkinson
c5eb3942f1 Merge branch '3.4.x'
Closes gh-44915
2025-03-26 19:25:56 +00:00
Andy Wilkinson
68041de427 Merge branch '3.3.x' into 3.4.x
Closes gh-44914
2025-03-26 19:25:44 +00:00
Andy Wilkinson
86d11c90e2 Allow dockerTest tasks to be run in parallel through configuration
Closes gh-44913
2025-03-26 19:25:05 +00: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
Moritz Halbritter
63e796c8fe Merge pull request #44901 from quaff
* pr/44901:
  Add 'spring.kafka.consumer.max-poll-interval' configuration property

Closes gh-44901
2025-03-26 12:07:37 +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
617244b473 Merge pull request #44900 from nosan
* pr/44900:
  Polish "Add OTLP span exporter builder customizers"
  Add OTLP span exporter builder customizers

Closes gh-44900
2025-03-26 12:00:51 +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
Andy Wilkinson
14bade645f Merge branch '3.4.x' 2025-03-26 10:49:54 +00:00
Andy Wilkinson
9fa4e0d80c Merge branch '3.3.x' into 3.4.x 2025-03-26 10:48:49 +00:00
Moritz Halbritter
b8928ef686 Merge branch '3.4.x'
Closes gh-44902
2025-03-26 10:31:23 +01:00
Moritz Halbritter
7f971d21a4 Merge pull request #44789 from nosan
* pr/44789:
  Add tests for OtlpTracingAutoConfiguration

Closes gh-44789
2025-03-26 10:27:19 +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
Andy Wilkinson
9cd6af9ecf Polish CheckBom task 2025-03-26 09:15:01 +00:00
Stéphane Nicoll
b5f743540a Merge pull request #44877 from izeye
* pr/44877:
  Remove extra ".0" in prohibit.versionRange for jOOQ

Closes gh-44877
2025-03-26 09:22:50 +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
e6b871352e Merge branch '3.4.x'
Closes gh-44899
2025-03-25 18:46:43 +00:00
Andy Wilkinson
a6ee681b48 Merge branch '3.3.x' into 3.4.x
Closes gh-44898
2025-03-25 18:40:59 +00:00
Andy Wilkinson
46a30e98bb Use ResolvedBom for bom checks
Closes gh-44897
2025-03-25 18:37:28 +00: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
Andy Wilkinson
14060a2116 Merge branch '3.4.x'
Closes gh-44893
2025-03-25 17:31:22 +00:00
Andy Wilkinson
32234545af Merge branch '3.3.x' into 3.4.x
Closes gh-44892
2025-03-25 17:31:10 +00:00
Andy Wilkinson
17be4bdb5f Use ResolvedBom as a source for AntoraAsciidocAttributes
Closes gh-44891
2025-03-25 17:30:28 +00:00
Brian Clozel
d47fe00331 Merge branch '3.4.x'
Closes gh-44890
2025-03-25 18:20:45 +01:00
Brian Clozel
ac9ad4598d Merge branch '3.3.x' into 3.4.x
Closes gh-44887
2025-03-25 18:20:03 +01:00
Dmytro Nosan
14bbceb038 Watch symlinks for changes for SSL hot reloading
Prior to this commit, the SSL file hot reloading feature would
create file watchers for all configured locations and would resolve
symbolic links if they're found as registrations.

This arrangement would work for typical Let's Encrypt setups, but
would not get notified of consecutive changes for k8s setups.
Kubernetes uses a mix of symlinks and atomic file moves to update
secrets.

This commit not only tracks changes to symlinks targets, but also
to the original symlink.

Closes gh-44807

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
[brian.clozel@broadcom.com: apply code conventions]
Signed-off-by: Brian Clozel <brian.clozel@broadcom.com>
2025-03-25 18:19:02 +01:00
Andy Wilkinson
87dd03962c Merge branch '3.4.x'
Closes gh-44889
2025-03-25 17:06:19 +00:00
Andy Wilkinson
aa6d2f19fd Merge branch '3.3.x' into 3.4.x
Closes gh-44888
2025-03-25 17:06:06 +00:00
Andy Wilkinson
4f91d41666 Source version properties for Maven plugin tests from resolved bom
Closes gh-44886
2025-03-25 17:05:45 +00:00
Andy Wilkinson
5bab52df6d Merge branch '3.4.x'
Closes gh-44885
2025-03-25 16:35:08 +00:00
Andy Wilkinson
f121cf76d4 Merge branch '3.3.x' into 3.4.x
Closes gh-44884
2025-03-25 16:34:54 +00:00
Andy Wilkinson
7d9bbb685e Remove unused dependenciesBom configuration
Closes gh-44883
2025-03-25 16:34:34 +00:00
Andy Wilkinson
a5a7788ebb Merge branch '3.4.x'
Closes gh-44882
2025-03-25 16:28:51 +00:00
Andy Wilkinson
42f5f63c8f Merge branch '3.3.x' into 3.4.x
Closes gh-44881
2025-03-25 16:28:41 +00:00
Andy Wilkinson
1047c2158a Use resolved bom as source of javadoc links
Closes gh-44878
2025-03-25 16:28:27 +00:00