Commit Graph

5326 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Stéphane Nicoll
95b882c385 Merge branch '3.4.x'
Closes gh-44875
2025-03-25 11:27:58 +01:00
Stéphane Nicoll
7424ad59ee Merge branch '3.3.x' into 3.4.x
Closes gh-44874
2025-03-25 11:27:50 +01:00
Stéphane Nicoll
b67a6551f9 Stop relying on jakarta.annotation in EmbeddedLdapAutoConfiguration
Closes gh-44870
2025-03-25 11:21:20 +01:00
Stéphane Nicoll
686628dfef Polish "Add support for configuring LDAP's referral property"
See gh-44850
2025-03-24 16:38:33 +01:00
Andras, Dobrosi
59705edbc2 Add support for configuring LDAP's referral property
See gh-44850

Signed-off-by: Andras, Dobrosi <dobrosi@gmail.com>
2025-03-24 16:24:37 +01:00
Stéphane Nicoll
fab1cf6ade Merge branch '3.4.x'
Closes gh-44844
2025-03-21 16:46:58 +01:00
Stéphane Nicoll
ba3de2bd35 Merge branch '3.3.x' into 3.4.x
Closes gh-44843
2025-03-21 16:46:50 +01:00
Stéphane Nicoll
c7f31ed12f Stop relying on test resources from another package
Closes gh-44836
2025-03-21 16:46:06 +01:00
Stéphane Nicoll
be608631f9 Merge branch '3.4.x'
Closes gh-44842
2025-03-21 16:44:23 +01:00
Stéphane Nicoll
7368b34d85 Merge branch '3.3.x' into 3.4.x
Closes gh-44841
2025-03-21 16:44:16 +01:00
Stéphane Nicoll
f94418dd6d Remove outdated classpath exclusions on Hazelcast client
Hazelcast client is no longer shipped as a separate JAR so the exclusion
doesn't do anything.

Closes gh-44835
2025-03-21 16:40:11 +01:00
Stéphane Nicoll
520d3431a9 Merge branch '3.4.x'
Closes gh-44840
2025-03-21 16:37:42 +01:00
Stéphane Nicoll
ac7d921d87 Merge branch '3.3.x' into 3.4.x
Closes gh-44839
2025-03-21 16:37:32 +01:00
Stéphane Nicoll
ced7eff799 Relocate JpaWebAutoConfigurationTests
Closes gh-44834
2025-03-21 16:29:19 +01:00
Yanming Zhou
509a790721 Polish
See gh-44814

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-21 08:32:34 +01:00
Stéphane Nicoll
09e19fdb9b Merge branch '3.4.x'
Closes gh-44829
2025-03-21 08:30:04 +01:00
Stéphane Nicoll
6280767870 Merge branch '3.3.x' into 3.4.x
Closes gh-44828
2025-03-21 08:29:28 +01:00
Stéphane Nicoll
1a608b7005 Add Yanming to the list of contributors
See gh-44800
2025-03-21 08:14:17 +01:00
Yanming Zhou
81db52063a Polishing BatchAutoConfigurationTests
1. Rename `TestConfiguration` to `TestJpaConfiguration` and remove unnecessary reference.
2. Use `withBean` instead of `withUserConfiguration` to avoid new configuration class.
3. Use kebab-case for configuration key

See gh-44800

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-21 08:12:45 +01:00
Stéphane Nicoll
03d26e1410 Merge branch '3.4.x'
Closes gh-44822
2025-03-21 07:53:56 +01:00
Stéphane Nicoll
ca61652edc Merge branch '3.3.x' into 3.4.x
Closes gh-44821
2025-03-21 07:53:51 +01:00
Stéphane Nicoll
3ea272ac2a Rewrite 2nd level cache to use ehcache
Closes gh-44809
2025-03-21 07:53:48 +01:00
Stéphane Nicoll
515ce3d44d Merge branch '3.4.x'
Closes gh-44820
2025-03-21 07:53:37 +01:00
Stéphane Nicoll
c39226b7a7 Merge branch '3.3.x' into 3.4.x
Closes gh-44819
2025-03-21 07:53:32 +01:00
Stéphane Nicoll
9091f3f58f Make link to DataSourceAutoConfiguration explicit
This commit updates DataSourceTransactionManagerAutoConfiguration to
explicitly states it should run after DataSourceAutoConfiguration.

Closes gh-44810
2025-03-21 07:53:30 +01:00
Stéphane Nicoll
1f526d6136 Merge branch '3.4.x'
Closes gh-44818
2025-03-21 07:53:17 +01:00
Stéphane Nicoll
7d409f704c Merge branch '3.3.x' into 3.4.x
Closes gh-44817
2025-03-21 07:53:10 +01:00
Stéphane Nicoll
7733551e0b Stop relying on JPA entities from another module in tests
Closes gh-44804
2025-03-21 07:53:08 +01:00