Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
52,900 Commits 23 Branches 0 Tags
7424ad59ee22fdff68d7cd19f317cd4456534f22
Commit Graph

27885 Commits

Author SHA1 Message Date
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
Phillip Webb
bfa11e3161 Merge branch '3.3.x' into 3.4.x 2025-03-24 13:40:11 -07:00
Phillip Webb
587ec6d8d4 Fix incorrect ConfigurationPropertyName javadoc 2025-03-24 13:39:43 -07:00
Stéphane Nicoll
cd726b27cd Switch to a Hazelcast container that works on latest ARM CPUs 
Closes gh-44838
 2025-03-21 16:48:52 +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
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
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
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
3460c0d19f Merge branch '3.3.x' into 3.4.x 
Closes gh-44826
 2025-03-21 08:09:01 +01:00
Stéphane Nicoll
28f8e3812b Fix code format 
See gh-44787
 2025-03-21 08:01:06 +01:00
Michael Yan
78b9eca670 Polish javadoc of SpringProfileAction 
See gh-44787

Signed-off-by: Michael Yan <rain@rainboyan.com>
 2025-03-21 07:59:35 +01:00
Stéphane Nicoll
c2e4793b05 Merge branch '3.3.x' into 3.4.x 
Closes gh-44823
 2025-03-21 07:57:16 +01:00
Michael Yan
45a99f9e5a Remove extra whitespace in logback defaults.xml 
See gh-44786

Signed-off-by: Michael Yan <rain@rainboyan.com>
 2025-03-21 07:55:14 +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
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
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
Andy Wilkinson
f86a6fb164 Upgrade to Spring Batch 5.2.2 
Closes gh-44568
 2025-03-19 17:48:56 +00:00
Moritz Halbritter
6567609cbc Merge branch '3.3.x' into 3.4.x 2025-03-19 09:49:43 +01:00
Moritz Halbritter
80b6c59669 Improve debuggability of DockerComposeTestExtension 2025-03-19 09:42:22 +01:00
Moritz Halbritter
6b9cd873ca Use gvenzl/oracle-free:23.6-slim which has ARM64 support 
See gh-35249
 2025-03-19 09:22:58 +01:00
Andy Wilkinson
a4a88d910c Upgrade to Spring WS 4.0.12 
Closes gh-44573
 2025-03-19 08:08:15 +00:00
Andy Wilkinson
089ce80b81 Upgrade to Spring Security 6.4.4 
Closes gh-44572
 2025-03-19 08:08:15 +00:00
Andy Wilkinson
6dc824a963 Upgrade to Spring Kafka 3.3.4 
Closes gh-44570
 2025-03-19 08:08:14 +00:00
Andy Wilkinson
bd70c5deef Upgrade to Spring Integration 6.4.3 
Closes gh-44776
 2025-03-19 08:08:14 +00:00
Andy Wilkinson
f6bd6dcf8e Upgrade to Logback 1.5.18 
Closes gh-44775
 2025-03-19 08:08:14 +00:00
Andy Wilkinson
2f68799c58 Upgrade to Jetty 12.0.18 
Closes gh-44774
 2025-03-19 08:08:14 +00:00
Andy Wilkinson
7970c26888 Upgrade to Jetty Reactive HTTPClient 4.0.9 
Closes gh-44773
 2025-03-19 07:59:14 +00:00
Andy Wilkinson
5f11a6d42e Upgrade to Spring WS 4.0.12 
Closes gh-44564
 2025-03-19 07:40:12 +00:00
Andy Wilkinson
bffbf84354 Upgrade to Spring Security 6.3.8 
Closes gh-44563
 2025-03-19 07:40:12 +00:00
Andy Wilkinson
2fdbc037b1 Upgrade to Spring Kafka 3.2.8 
Closes gh-44772
 2025-03-19 07:40:12 +00:00
Andy Wilkinson
a8e91fd885 Upgrade to Spring Integration 6.3.9 
Closes gh-44771
 2025-03-19 07:40:12 +00:00
Andy Wilkinson
ee901486dc Upgrade to Logback 1.5.18 
Closes gh-44770
 2025-03-19 07:40:11 +00:00
Andy Wilkinson
afce8b9a10 Upgrade to Jetty 12.0.18 
Closes gh-44769
 2025-03-19 07:40:11 +00:00
Andy Wilkinson
a3a6a5ead9 Upgrade to Jetty Reactive HTTPClient 4.0.9 
Closes gh-44768
 2025-03-19 07:39:09 +00:00
Andy Wilkinson
7ec8112721 Merge branch '3.3.x' into 3.4.x 
Closes gh-44764
 2025-03-18 19:26:48 +00:00
Andy Wilkinson
6105c5e50f Polish javadoc of SqlR2dbcScriptDatabaseInitializer 
Closes gh-44763
 2025-03-18 19:26:14 +00:00
Andy Wilkinson
e237390e66 Ignore prototype DataSource beans for metrics and health 
Previously, if a prototype DataSource bean was defined, Actuator's
metrics and health would try to access an instance of it. At best
this was wasteful as the new instance would only be used for metrics
and health and would not be indicative of the app's DataSource usage.
At worst, it could cause a failure in the unusual case of the
prototype bean definition requiring arguments to be supplied using
ObjectProvider.getObject(Object...) or the like.

This commit address the problem by ignoring prototype DataSource
for metrics and health.

Other types of beans for which Actuator provides metrics and health
are similarly affected. They have not be fixed here as the situation
is so unusual. Should another problem arise in the future, it can be
addressed at that time when there's a clear need.

Closes gh-44706
 2025-03-18 19:10:45 +00:00
Stéphane Nicoll
4dea97141c Merge branch '3.3.x' into 3.4.x 
Closes gh-44759
 2025-03-18 15:25:57 +01:00
Stéphane Nicoll
08b2c560dd Order dependencies 
Closes gh-44757
 2025-03-18 15:22:26 +01:00
Moritz Halbritter
c2075bf8e0 Document support for Java 24 
Closes gh-44754
 2025-03-18 14:00:14 +01:00
Stéphane Nicoll
9515c6fb43 Merge branch '3.3.x' into 3.4.x 
Closes gh-44750
 2025-03-18 09:53:43 +01:00