52745 Commits

Author SHA1 Message Date
Stéphane Nicoll
f91d2df403 Start building against Spring AMQP 3.1.9 snapshots
See gh-44277
2025-02-14 16:57:04 +01:00
Andy Wilkinson
e71bdab8c0 Merge branch '3.3.x' into 3.4.x
Closes gh-44273
2025-02-14 08:35:09 +00:00
Andy Wilkinson
589a84d72a Upgrade Java version in .sdkmanrc to 17.0.14
Closes gh-44272
2025-02-14 08:34:46 +00:00
Stéphane Nicoll
d1ed2bbe1c Merge branch '3.3.x' into 3.4.x 2025-02-14 08:13:18 +01:00
Stéphane Nicoll
f7cbddabc5 Upgrade to Spring LDAP 3.2.11
Closes gh-44111
2025-02-14 07:54:46 +01:00
Stéphane Nicoll
21b60098bc Upgrade to Spring LDAP 3.2.11
Closes gh-44124
2025-02-14 07:54:36 +01:00
Stéphane Nicoll
cd2f131412 Upgrade to Couchbase Client 3.7.8
Closes gh-44269
2025-02-14 07:54:35 +01:00
Stéphane Nicoll
3b51522818 Merge branch '3.3.x' into 3.4.x 2025-02-13 17:15:14 +01:00
Stéphane Nicoll
15494d7f89 Upgrade to Spring Framework 6.2.3
Closes gh-44120
2025-02-13 17:03:39 +01:00
Stéphane Nicoll
3671e64aff Upgrade to Json-smart 2.5.2
Closes gh-44264
2025-02-13 17:03:38 +01:00
Stéphane Nicoll
188c9a794a Upgrade to Spring Framework 6.1.17
Closes gh-44107
2025-02-13 16:58:59 +01:00
Stéphane Nicoll
69f01052dd Upgrade to Json-smart 2.5.2
Closes gh-44263
2025-02-13 16:58:59 +01:00
Andy Wilkinson
e12ae999b1 Merge branch '3.3.x' into 3.4.x
Closes gh-44261
2025-02-13 14:49:02 +00:00
Andy Wilkinson
2e00552130 Move MockPkcs11Security to spring-boot-testsupport
Closes gh-44260
2025-02-13 14:48:16 +00:00
Andy Wilkinson
015649a935 Merge pull request #44253 from quaff
* gh-44253:
  Include non-default HikariDataSource candidates in metrics

Closes gh-44253
2025-02-13 10:36:25 +00:00
Yanming Zhou
437fc028a0 Include non-default HikariDataSource candidates in metrics
See https://github.com/spring-projects/spring-boot/issues/43481#issuecomment-2655527313

See gh-44253

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-02-13 10:35:08 +00:00
Andy Wilkinson
885fcdbffc Merge branch '3.3.x' into 3.4.x
Closes gh-44255
2025-02-13 10:33:25 +00:00
Andy Wilkinson
874ee9936a Improve handling of default values when printing the banner
Previously, default values for the following properties did not work:

- application.title
- application.formatted-version
- application.version
- spring-boot.formatted-version
- spring-boot.version

Instead of the default value, an empty string was used instead. For
example, ${application.title:Title} would be replaced with "" rather
than "Title" when the application title was unavailable.

This commit improves the ResourceBanner so that a placeholder's
default value is used. An empty string will still be used when no
default value is provided. For example, ${application.title} will
be replaced with "". As before, custom properties that are not
well-known will not be replaced at all. For example
${custom.property} will remain as-is in the printed banner when
the custom.property has not been set.

Fixes gh-44137
2025-02-13 10:13:12 +00:00
Andy Wilkinson
4cb9d816b9 Include non-default candidates in metrics and health
Previously, when Actuator expected to find multiple beans of the same
type, it used Map<String, Type> to inject them. Unfortunately, this
does not include beans that are not default candidates and there's
no way to request that autowiring includes such beans with Map-based
injection.

This commit switches from Map-based injection to querying the bean
factory for the desired beans. This is done using
SimpleAutowireCandidateResolver's new helper method,
resolveAutowireCandidates, that returns a Map<String, Type> of
beans including those that are not default candidates but excluding
those that are not autowire candidates.

Closes gh-43481
2025-02-12 21:44:41 +00:00
Stéphane Nicoll
f6f0daa47d Merge branch '3.3.x' into 3.4.x
Closes gh-44245
2025-02-12 20:25:20 +01:00
Stéphane Nicoll
f9540c0588 Merge pull request #44240 from jearton
* pr/44240:
  Update copyright year of changed file
  Polish variable name in ServletWebServerApplicationContext.selfInitialize()

Closes gh-44240
2025-02-12 20:25:13 +01:00
Stéphane Nicoll
a57fd8002f Update copyright year of changed file
See gh-44240
2025-02-12 20:22:48 +01:00
zhoudong
6177010b11 Polish variable name in ServletWebServerApplicationContext.selfInitialize()
See gh-44240

Signed-off-by: zhoudong <jearton1024@gmail.com>
2025-02-12 20:22:14 +01:00
Stéphane Nicoll
9c7121b7c1 Merge branch '3.3.x' into 3.4.x 2025-02-12 05:16:00 +01:00
Stéphane Nicoll
fb7f307c4b Start building against Spring Framework 6.2.3 snapshots
See gh-44120
2025-02-12 05:14:17 +01:00
Stéphane Nicoll
ce04ad3112 Start building against Spring Framework 6.1.17 snapshots
See gh-44107
2025-02-12 04:59:45 +01:00
Stéphane Nicoll
69c23e86d8 Merge branch '3.3.x' into 3.4.x
Closes gh-44222
2025-02-11 15:11:44 +01:00
Stéphane Nicoll
6e33bd9fbb Prevent upgrade to Tomcat 10.1.35
Closes gh-44219
2025-02-11 15:11:15 +01:00
Stéphane Nicoll
a07bcdd07b Merge branch '3.3.x' into 3.4.x 2025-02-11 15:05:57 +01:00
Stéphane Nicoll
16b7ac948f Upgrade to Reactor Bom 2024.0.3
Closes gh-44117
2025-02-11 13:52:45 +01:00
Stéphane Nicoll
486825415e Upgrade to Netty 4.1.118.Final
Closes gh-44221
2025-02-11 13:52:44 +01:00
Stéphane Nicoll
020dfb64c1 Upgrade to Micrometer Tracing 1.4.3
Closes gh-44116
2025-02-11 13:52:40 +01:00
Stéphane Nicoll
6bce2b4736 Upgrade to Micrometer 1.14.4
Closes gh-44115
2025-02-11 13:52:39 +01:00
Stéphane Nicoll
812bc4e09b Upgrade to Hibernate 6.6.7.Final
Closes gh-44220
2025-02-11 13:52:39 +01:00
Stéphane Nicoll
c5779b2f8b Upgrade to Reactor Bom 2023.0.15
Closes gh-44104
2025-02-11 13:51:35 +01:00
Stéphane Nicoll
2ee5e23a47 Upgrade to Netty 4.1.118.Final
Closes gh-44218
2025-02-11 13:51:35 +01:00
Stéphane Nicoll
18c64524a8 Upgrade to Micrometer Tracing 1.3.9
Closes gh-44103
2025-02-11 13:51:31 +01:00
Stéphane Nicoll
6fe757f72e Upgrade to Micrometer 1.13.11
Closes gh-44102
2025-02-11 13:51:30 +01:00
Andy Wilkinson
18db70533d Merge branch '3.3.x' into 3.4.x
Closes gh-44215
2025-02-11 12:31:07 +00:00
Andy Wilkinson
3e5929a446 Remove duplicate dispatcher servlet auto-config tests
Closes gh-44207
2025-02-11 12:19:45 +00:00
Andy Wilkinson
30d7af4e38 Add CI with Java 24
Closes gh-44205
2025-02-11 11:34:43 +00:00
Andy Wilkinson
b8f64681ad Merge branch '3.3.x' into 3.4.x
Closes gh-44211
2025-02-11 11:10:28 +00:00
Andy Wilkinson
5c8d9d910a Update LoaderIntegrationTests as Java 23 is no longer in early access
Closes gh-44208
2025-02-11 11:09:36 +00:00
Andy Wilkinson
c5d21e0e63 Add TWENTY_FOUR to JavaVersion enum
Closes gh-44209
2025-02-11 11:03:02 +00:00
Andy Wilkinson
5502e1443e Upgrade to Neo4j Java Driver 5.28.1
Closes gh-44195
2025-02-10 12:25:43 +00:00
Andy Wilkinson
167dfd6bc9 Merge branch '3.3.x' into 3.4.x
Closes gh-44193
2025-02-10 11:09:12 +00:00
Andy Wilkinson
ea76e46faa Apply charset to Mustache's content type
Fixes gh-44053
2025-02-10 11:07:49 +00:00
Andy Wilkinson
c3c7ed4c2e Fix class cast during additional path matching with health probes
Previously, when health probes were enabled, the post-processor of
AutoConfiguredHealthEndpointGroups resulted in the bean no longer
implementing AdditionalPathMapper. This then caused a
ClassCastException when working with AdditionalPathMapper beans
in EndpointRequest's additional path mapping support.

This commit updates the type returned by the post-processor to
implement both HealthEndpointGroups and AdditionalPathMapper, as
AutoConfiguredHealthEndpointGroups does. Its implementation of
getAdditionalPaths produces a result that combines both the
additional paths of the original HealthEndpointGroups bean and its
own additional paths for the probes.

Fixes gh-44052
2025-02-10 10:01:19 +00:00
Andy Wilkinson
1c0253b380 Align reactive EndpointRequest with servlet equivalent
Closes gh-44189
2025-02-10 09:28:28 +00:00
Andy Wilkinson
3603cb4ad9 Fix matching against context with implicit server namespace
Closes gh-44188
2025-02-10 09:18:46 +00:00