Commit Graph

52900 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
67f9cc555a Merge pull request #44800 from quaff
* pr/44800:
  Add Yanming to the list of contributors
  Polishing BatchAutoConfigurationTests

Closes gh-44800
2025-03-21 08:21:44 +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
f44c17cf9a Merge pull request #44787 from rainboyan
* pr/44787:
  Fix code format
  Polish javadoc of SpringProfileAction

Closes gh-44787
2025-03-21 08:08:57 +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
Stéphane Nicoll
3b4f98c94c Merge pull request #44786 from rainboyan
* pr/44786:
  Remove extra whitespace in logback defaults.xml

Closes gh-44786
2025-03-21 07:55:29 +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
Stéphane Nicoll
48024479b6 Merge branch '3.3.x' into 3.4.x
Closes gh-44815
2025-03-21 07:52:43 +01:00
Stéphane Nicoll
d930b3e8b8 Configure copyright updates on package-info.java as well
Closes gh-44801
2025-03-21 07:51:13 +01:00
Phillip Webb
931f6a4d24 Next development version (v3.4.5-SNAPSHOT) 2025-03-20 20:41:20 -07:00
Stéphane Nicoll
6ba94aebee Merge branch '3.3.x' into 3.4.x 2025-03-20 11:15:06 +01:00
Stéphane Nicoll
36a5936494 Next development version (v3.3.11-SNAPSHOT) 2025-03-20 11:14:56 +01:00
Stéphane Nicoll
375aba6985 Upgrade to Spring Framework 6.2.5
Closes gh-44731
2025-03-20 08:35:45 +01:00
Phillip Webb
37e4a3c566 Merge branch '3.3.x' into 3.4.x
Closes gh-44790
2025-03-19 14:13:11 -07:00
Phillip Webb
99fa21cfbb Upgrade to asciidoctor-extensions 1.0.0-alpha.17
Fixes gh-44583
2025-03-19 14:10:27 -07: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
c904775e19 Merge branch '3.3.x' into 3.4.x 2025-03-19 07:56:50 +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