Commit Graph

52951 Commits

Author SHA1 Message Date
Andy Wilkinson
cefcdcfdd0 Polish RequestMatcherProvider deprecation javadoc
See gh-gh-29596
2025-02-14 07:44:47 +00:00
Stéphane Nicoll
3e0dc8f3b5 Merge branch '3.4.x' 2025-02-14 08:13:33 +01: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
6c85da3c15 Upgrade to Spring LDAP 3.3.0-M2
Closes gh-44164
2025-02-14 07:55:15 +01:00
Stéphane Nicoll
95eb8f8263 Upgrade to Spring HATEOAS 2.5.0-M1
Closes gh-44169
2025-02-14 07:55:15 +01:00
Stéphane Nicoll
1bb1489aed Upgrade to Couchbase Client 3.7.8
Closes gh-44271
2025-02-14 07:55:14 +01:00
Stéphane Nicoll
558e039540 Upgrade to Cassandra Driver 4.19.0
Closes gh-44270
2025-02-14 07:55:10 +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
a378199f23 Merge branch '3.4.x' 2025-02-13 17:15:32 +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
641f11da7c Upgrade to Spring Framework 6.2.3
Closes gh-44160
2025-02-13 17:06:21 +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
1d35deaaf0 Merge branch '3.4.x'
Closes gh-44262
2025-02-13 14:49:15 +00: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
682dbe9574 Merge pull request #44163 from null
* gh-44173:
  Polish "Add support for MVC router functions to mappings endpoint"
  Add support for MVC router functions to mappings endpoint

Closes gh-44163
2025-02-13 11:18:34 +00:00
Andy Wilkinson
b2ba2a53fe Polish "Add support for MVC router functions to mappings endpoint"
See gh-44163
2025-02-13 11:18:17 +00:00
puppy4c
a747bcf6d4 Add support for MVC router functions to mappings endpoint
See gh-44163

Signed-off-by: puppy4c <puppy4c@foxmail.com>
2025-02-13 10:52:23 +00:00
Andy Wilkinson
4c097b9841 Merge branch '3.4.x'
Closes gh-44257
2025-02-13 10:50:02 +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
72413529ba Merge branch '3.4.x'
Closes gh-44256
2025-02-13 10:33:40 +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
Stéphane Nicoll
64b1e56cc9 Merge pull request #44202 from onobc
* pr/44202:
  Use Pulsar Client Reactive BOM

Closes gh-44202
2025-02-13 10:35:34 +01:00
Chris Bono
00cc470354 Use Pulsar Client Reactive BOM
This replaces the individual module entries for the
`pulsar-client-reactive` library with a single import
entry for the `pulsar-client-reactive-bom` in order to
ease dependency management.

See gh-44202

Signed-off-by: Chris Bono <chris.bono@gmail.com>
2025-02-13 10:33:31 +01:00
Stéphane Nicoll
849242e2c2 Merge pull request #44242 from nosan
* pr/44242:
  Polish "Add RuntimeHints for StackTracePrinter"
  Add RuntimeHints for StackTracePrinter

Closes gh-44242
2025-02-13 10:32:19 +01:00
Stéphane Nicoll
f866e20410 Polish "Add RuntimeHints for StackTracePrinter"
See gh-44242
2025-02-13 10:27:28 +01:00
Dmytro Nosan
5d781ffcbb Add RuntimeHints for StackTracePrinter
See gh-44242

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-13 09:00:10 +01:00
Stéphane Nicoll
9f920be87c Merge pull request #44247 from nosan
* pr/44247:
  Polish contribution
  Polish

Closes gh-44247
2025-02-13 08:59:42 +01:00
Stéphane Nicoll
9dea179d39 Polish contribution
See gh-44247
2025-02-13 08:52:09 +01:00
Dmytro Nosan
b9772cd6f1 Polish
See gh-44247

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-13 08:47:16 +01:00
Andy Wilkinson
1710ff4eb5 Merge branch '3.4.x'
Closes gh-44248
2025-02-12 21:52:30 +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
1d74d3df6f Merge branch '3.4.x'
Closes gh-44246
2025-02-12 20:25:43 +01: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
be7a646d55 Upgrade to MariaDB 3.5.2
Closes gh-44239
2025-02-12 09:09:31 +01:00
Stéphane Nicoll
d4ad8f57cb Upgrade to Json-smart 2.5.2
Closes gh-44238
2025-02-12 09:09:26 +01:00
Stéphane Nicoll
961fcbd1ca Upgrade to Elasticsearch Client 8.17.2
Closes gh-44226
2025-02-12 09:09:22 +01:00
Stéphane Nicoll
d13fb86370 Merge branch '3.4.x' 2025-02-12 05:16:10 +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
59dfe372ea Start building against Spring Framework 6.2.3 snapshots
See gh-44160
2025-02-12 05:15:34 +01:00