Stéphane Nicoll
4d21f1e8b1
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44307
2025-02-17 13:10:10 +01:00
Dmytro Nosan
35a77e2cf1
Fix build
...
See gh-44306
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com >
2025-02-17 13:09:52 +01:00
Andy Wilkinson
9fa40adb45
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44303
2025-02-17 11:01:31 +00:00
Andy Wilkinson
045fbee395
Document need for $ separator when auto-config is nested
...
Closes gh-44298
2025-02-17 11:00:29 +00:00
Stéphane Nicoll
2adbc24be1
Polish
2025-02-17 11:49:59 +01:00
Stéphane Nicoll
db34e37041
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44301
2025-02-17 11:30:55 +01:00
Tran Ngoc Nhan
f3ce5bca0c
Clarifyt when UserDetailsService auto-configuration will back off
...
See gh-44267
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com >
2025-02-17 11:29:37 +01:00
Tran Ngoc Nhan
d212232d9d
Implement RuntimeHintsRegistrar
...
CLoses gh-44299
2025-02-17 11:21:04 +01:00
Tran Ngoc Nhan
e982136f5e
Implement RuntimeHintsRegistrar
...
See gh-44266
2025-02-17 11:09:29 +01:00
Stéphane Nicoll
e67c8b43a2
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44296
2025-02-17 11:06:58 +01:00
Stéphane Nicoll
6aa0055e5e
Polish "Do not auto-configure ViewResolver if spring-webmvc is absent"
...
See gh-44259
2025-02-17 11:01:23 +01:00
Dmytro Nosan
ac73766f9b
Do not auto-configure ViewResolver if spring-webmvc is absent
...
See gh-44259
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com >
2025-02-17 11:01:07 +01:00
Stéphane Nicoll
40eefd5cae
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44294
2025-02-17 10:53:48 +01:00
Dmytro Nosan
c28c16eb9c
Destroy WebServer if ReactiveWebServerApplicationContext refresh fails
...
Prior to this commit, if ReactiveWebServerApplicationContext failed to
refresh, only WebServer.stop() was called.
This commit additionally invokes WebServer.destroy(), aligning
the behavior with ServletWebServerApplicationContext when a refresh
failure occurs.
See gh-44134
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com >
2025-02-17 10:45:34 +01:00
Stéphane Nicoll
a557cc9469
Upgrade to Spring Data Bom 2024.1.3
...
Closes gh-44119
2025-02-14 17:13:02 +01:00
Stéphane Nicoll
f12f712ab9
Upgrade to REST Assured 5.5.1
...
Closes gh-44281
2025-02-14 17:13:01 +01:00
Stéphane Nicoll
1c946f9b64
Upgrade to Prometheus Client 1.3.6
...
Closes gh-44280
2025-02-14 17:12:57 +01:00
Stéphane Nicoll
0a673881a4
Upgrade to Spring Data Bom 2024.0.9
...
Closes gh-44106
2025-02-14 17:11:04 +01:00
Stéphane Nicoll
c70c916593
Start building against Spring AMQP 3.2.3 snapshots
...
See gh-44278
2025-02-14 16:59:40 +01:00
Stéphane Nicoll
f91d2df403
Start building against Spring AMQP 3.1.9 snapshots
...
See gh-44277
2025-02-14 16:57:04 +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
3671e64aff
Upgrade to Json-smart 2.5.2
...
Closes gh-44264
2025-02-13 17:03:38 +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
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
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
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
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
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