Commit Graph

55067 Commits

Author SHA1 Message Date
Andy Wilkinson
dc1756c079 Merge branch 'main' into 4.0.x 2025-06-11 20:31:24 +01:00
Andy Wilkinson
5b759c750b Deprecate GraphQlProperties.DeprecatedSse
Closes gh-45878
2025-06-11 10:30:00 +01:00
Stéphane Nicoll
ebafa4df13 Start building against Spring WS 5.0.0-M1 snapshots
See gh-45873
2025-06-10 20:24:55 +02:00
Stéphane Nicoll
9f979c1109 Harmonize dependencies 2025-06-10 17:45:12 +02:00
Stéphane Nicoll
f6798b1dfb Merge branch 'main' into 4.0.x 2025-06-10 17:30:19 +02:00
Stéphane Nicoll
0daf3f5897 Merge branch '3.4.x' 2025-06-10 17:30:00 +02:00
Stéphane Nicoll
f229cedd6d Merge branch '3.3.x' into 3.4.x 2025-06-10 17:29:51 +02:00
Stéphane Nicoll
60ce7e06ae Upgrade to Tomcat 10.1.42
Closes gh-45872
2025-06-10 17:24:44 +02:00
Stéphane Nicoll
e02ab50789 Upgrade to Reactor Bom 2024.0.7
Closes gh-45778
2025-06-10 17:24:40 +02:00
Stéphane Nicoll
b496b8d0fd Upgrade to Infinispan 15.2.3.Final
Closes gh-45871
2025-06-10 17:24:40 +02:00
Stéphane Nicoll
d25068d65a Upgrade to Tomcat 10.1.42
Closes gh-45870
2025-06-10 17:20:30 +02:00
Stéphane Nicoll
b1454efb9d Upgrade to Reactor Bom 2024.0.7
Closes gh-45765
2025-06-10 17:20:26 +02:00
Stéphane Nicoll
aff4dcc2c0 Upgrade to Tomcat 10.1.42
Closes gh-45869
2025-06-10 17:12:53 +02:00
Stéphane Nicoll
d9d8dfbac6 Upgrade to Reactor Bom 2023.0.19
Closes gh-45751
2025-06-10 17:12:49 +02:00
Andy Wilkinson
784c1e7fdc Revert "Upgrade to MongoDB 5.5.1"
This reverts commit d996ef9ebd.

See gh-45866
2025-06-10 12:05:09 +01:00
Stéphane Nicoll
d996ef9ebd Upgrade to MongoDB 5.5.1
Closes gh-45866
2025-06-10 12:27:05 +02:00
Andy Wilkinson
b313d52829 Merge branch 'main' into 4.0.x 2025-06-10 11:07:49 +01:00
Andy Wilkinson
3e3be2b407 Polish 2025-06-10 11:07:38 +01:00
Andy Wilkinson
d58b613db6 Polish 2025-06-10 10:58:36 +01:00
Andy Wilkinson
6df3de7357 Merge branch 'main' into 4.0.x 2025-06-10 10:47:05 +01:00
Andy Wilkinson
9d0061be97 Merge branch 'main' into 4.0.x 2025-06-10 10:46:52 +01:00
Andy Wilkinson
9a1ca2fe83 Stop ignoring prefixed environment variables in management context
Binding in the child context does not work correctly when an
environment prefix has been configured. The prefix is not applied
to the child context's Environment and, therefore, prefixed
environment variables are ignored during binding.

We can fix the problem by reusing the parent context's
ManagementServerProperties rather than binding them again in the
child context. Doing so will fix the problem reported in gh-45857
that was introduced in 020fd7b and will also avoid an unnecessary
second binding of the properties.

gh-45858 may fix the problem more generally by applying the prefix
to the child context's environment. This would benefit situations
where the properties need to be bound in the child context because
they haven't already been bound in the parent.

Closes gh-45847
2025-06-10 10:31:37 +01:00
Stéphane Nicoll
f66159e4b1 Upgrade to MongoDB 5.5.1
Closes gh-45865
2025-06-10 10:18:19 +02:00
Stéphane Nicoll
415c8ce5b0 Upgrade to Caffeine 3.2.1
Closes gh-45864
2025-06-10 10:18:15 +02:00
Andy Wilkinson
af736488e7 Merge branch 'main' into 4.0.x 2025-06-10 09:00:50 +01:00
Andy Wilkinson
523c26c75d Merge branch '3.4.x'
Closes gh-45863
2025-06-10 09:00:34 +01:00
Andy Wilkinson
515abc4221 Include all auto-config modules in auto-config classes appendix
Closes gh-45861
2025-06-10 08:58:42 +01:00
Stéphane Nicoll
c437fd789e Merge branch 'main' into 4.0.x 2025-06-10 07:44:21 +02:00
Stéphane Nicoll
71be71ecdb Merge branch '3.4.x' 2025-06-10 07:44:09 +02:00
Stéphane Nicoll
58a9119778 Merge branch '3.3.x' into 3.4.x 2025-06-10 07:44:01 +02:00
Stéphane Nicoll
7378a613b1 Upgrade to Micrometer Tracing 1.5.1
Closes gh-45777
2025-06-10 07:04:58 +02:00
Stéphane Nicoll
3f7be2f4e6 Upgrade to Micrometer 1.15.1
Closes gh-45776
2025-06-10 07:04:58 +02:00
Stéphane Nicoll
c4d4615f6d Upgrade to Micrometer Tracing 1.4.7
Closes gh-45764
2025-06-10 07:04:40 +02:00
Stéphane Nicoll
3564b359b9 Upgrade to Micrometer 1.14.8
Closes gh-45763
2025-06-10 07:04:40 +02:00
Stéphane Nicoll
aa2a547602 Upgrade to Micrometer Tracing 1.3.13
Closes gh-45750
2025-06-10 07:04:35 +02:00
Stéphane Nicoll
c2528b1bfd Upgrade to Micrometer 1.13.15
Closes gh-45749
2025-06-10 07:04:35 +02:00
Phillip Webb
dde2486a57 Merge branch 'main' into 4.0.x 2025-06-09 17:54:31 -07:00
Phillip Webb
4301186a95 Fix SystemEnvironmentPropertyMapper tests and remove duplicate names
See gh-45741
2025-06-09 17:53:48 -07:00
Phillip Webb
06f763a35b Merge branch 'main' into 4.0.x 2025-06-09 18:06:38 +01:00
Phillip Webb
bb13eaa837 Support lower case configuration properties system environment names
Update `SystemEnvironmentPropertyMapper` to generate both mappings
in both the original case and upper case.

This restores the behavior of Spring Boot 3.4 where the system
environment could contain lowercase names.

Fixes gh-45741
2025-06-09 18:06:26 +01:00
Phillip Webb
2f891c250b Merge branch '3.4.x' 2025-06-09 18:06:20 +01:00
Phillip Webb
740362d394 Merge branch '3.3.x' into 3.4.x 2025-06-09 17:44:25 +01:00
Phillip Webb
f12d96886a Test SpringIterableConfigurationPropertySource support lower case names
Add a test to ensure that `SpringIterableConfigurationPropertySource`
can support lower case names.

See gh-45741
2025-06-09 17:44:05 +01:00
Andy Wilkinson
c2cf609904 Merge branch 'main' into 4.0.x 2025-06-09 17:01:28 +01:00
Andy Wilkinson
c2c1fc90b3 Merge branch '3.4.x'
Closes gh-45860
2025-06-09 17:01:18 +01:00
Andy Wilkinson
bfe60a95f0 Merge branch '3.3.x' into 3.4.x
Closes gh-45859
2025-06-09 17:01:09 +01:00
Andy Wilkinson
8fa7843d71 Remove dependency management for Micrometer Context Propagation
It's now managed as part of Micrometer's bom so we no longer need to
manage it separately (and our separate management was being overriden
by Micrometer's bom anyway).

Closes gh-45852
2025-06-09 16:25:20 +01:00
Andy Wilkinson
4f7792870d Merge branch 'main' into 4.0.x 2025-06-09 16:23:05 +01:00
Andy Wilkinson
abc0077140 Remove redundant test
Support for Zipkin export using a RestTemplate- or WebClient-based
sender was deprecated in 3.3 and then removed in 3.5. This made
redundant the tests that checked there was no cycle when using
RestTemplate or WebClient.

Closes gh-45847
2025-06-09 16:21:28 +01:00
Phillip Webb
8d9e8c4f64 Merge branch 'main' into 4.0.x
Closes gh-45856
2025-06-09 10:51:04 +01:00