Commit Graph

28030 Commits

Author SHA1 Message Date
Stéphane Nicoll cacb3d4820 Polish "Remove deprecated micrometer.observations.annotations.enabled"
See gh-44320
2025-02-18 11:22:39 +01:00
Johnny Lim 1c9bc7f336 Remove deprecated micrometer.observations.annotations.enabled
See gh-44320

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-18 11:20:07 +01:00
Stéphane Nicoll 5c49a76c82 Merge branch '3.4.x'
Closes gh-44322
2025-02-18 11:18:45 +01:00
Stéphane Nicoll ceaf88c1a4 Polish "Include non-default DataSource candidates"
See gh-44293
2025-02-18 11:18:26 +01:00
Yanming Zhou 8d27f4ee7c Include non-default DataSource candidates
This commit updates H2ConsoleAutoConfiguration to consider non-default
data sources when logging connection URLs.

See gh-44293

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-02-18 11:18:26 +01:00
Andy Wilkinson 1be1876628 Merge branch '3.4.x'
Closes gh-44321
2025-02-18 10:06:02 +00:00
Andy Wilkinson 0eeb0b61de Merge branch '3.3.x' into 3.4.x
Closes gh-44319
2025-02-18 10:05:37 +00:00
Andy Wilkinson 0a42082671 Fail fast when trying to use SNI with reactive Jetty
Previously only a servlet-based Jetty server would fail fast when
trying to use SNI with Jetty. A reactive Jetty server just ignored
the configuration. This commit aligns the behavior of the two by
making the reactive server fail fast as well.

Closes gh-44316
2025-02-18 10:05:09 +00:00
Stéphane Nicoll c1d4531eb5 Merge branch '3.4.x'
Closes gh-44318
2025-02-18 11:03:15 +01:00
Stéphane Nicoll b0a6d325c9 Merge branch '3.3.x' into 3.4.x
Closes gh-44317
2025-02-18 11:03:06 +01:00
Stéphane Nicoll 062b73f4a4 Polish contribution
See gh-44310
2025-02-18 10:59:52 +01:00
Dmytro Nosan 84bde2a836 Catch WebServer stop or destroy exception when context refresh fails
This commit adds the stop or destroy failure as a suppressed
exception if either ServletWebServerApplicationContext or
ReactiveWebServerApplicationContext refresh fails.

See gh-44310

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-18 10:55:04 +01:00
Johnny Lim 487e56a5a9 Add Javadoc since for UndertowReactiveWebServerFactory.getAccessLogPrefix()
See gh-44313

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-18 09:58:20 +01:00
Moritz Halbritter 5883fc210f Revert "Fix ApplicationResourceLoaderTests on Windows"
This reverts commit 09ac085a6a.
2025-02-17 18:08:06 +01:00
Dmytro Nosan 183b9e6920 Handle absolute files on Windows
See gh-44309

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-17 18:05:37 +01:00
Moritz Halbritter 09ac085a6a Fix ApplicationResourceLoaderTests on Windows 2025-02-17 17:46:37 +01:00
Moritz Halbritter dc4dbd1bf2 Rename management.server.accesslog.prefix
Closes gh-44196
2025-02-17 14:48:49 +01:00
Moritz Halbritter 8ff1e631fe Document SSL support for Docker Compose and Testcontainers
Closes gh-41137
2025-02-17 13:36:26 +01:00
Moritz Halbritter dae891f473 Add SSL service connection support for Kafka
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter 789d30deab Add SSL service connection support for ElasticSearch
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter 7cf9cc74a2 Add SSL service connection support for Redis
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter b773dcd356 Add ability to copy additional files when running Docker Compose tests
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter 109fd6f97d Add SSL service connection support for MongoDB
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter 0ccf1b81d8 Add SSL service connection support for Couchbase
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter 9c520d6af7 Add SSL service connection support for Cassandra
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter e26ccbe028 Add SSL service connection support for AMQP
See gh-41137
2025-02-17 13:23:15 +01:00
Moritz Halbritter b62a0c1ae0 Add SSL support to Docker Compose and Testcontainers infrastructure
See gh-41137

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-02-17 13:23:15 +01:00
Moritz Halbritter 528b7e9ad9 Add working directory support for ApplicationResourceLoader
See gh-41137
2025-02-17 13:23:15 +01:00
Moritz Halbritter d8b470a511 Add method to create an SslBundle which uses the system default managers
See gh-41137
2025-02-17 13:23:15 +01:00
Stéphane Nicoll 631d07cfe1 Merge branch '3.4.x'
Closes gh-44308
2025-02-17 13:10:17 +01:00
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
Stéphane Nicoll 3ed0e021ac Polish "Auto-configure ObjectDirectoryMapper"
See gh-44290
2025-02-17 12:02:39 +01:00
Dmytro Nosan 8435aeb0e2 Auto-configure ObjectDirectoryMapper
This commit improves LdapAutoConfiguration to also auto-configure an
ObjectDirectoryMapper and configure LdapTemplate to use it.

See gh-44290

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-17 12:02:39 +01:00
Andy Wilkinson ca1bd3f633 Merge branch '3.4.x'
Closes gh-44304
2025-02-17 11:01:43 +00: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 514666b210 Polish 2025-02-17 11:33:15 +01:00
Stéphane Nicoll 2884caee36 Merge branch '3.4.x'
Closes gh-44302
2025-02-17 11:31:03 +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
Stéphane Nicoll 980202f654 Merge branch '3.4.x'
Closes gh-44300
2025-02-17 11:22:14 +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 4ef74747ef Merge branch '3.4.x'
Closes gh-44297
2025-02-17 11:07:05 +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 667b161d8c Merge branch '3.4.x'
Closes gh-44295
2025-02-17 10:53:57 +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 8d713fb6c7 Polish "Auto-configure CqlTemplate and ReactiveCqlTemplate"
See gh-44291
2025-02-17 09:20:03 +01:00
Dmytro Nosan e8661f6bee Auto-configure CqlTemplate and ReactiveCqlTemplate
See gh-44291

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-17 09:14:06 +01:00
Stéphane Nicoll 755ef85587 Upgrade to Spring Data Bom 2025.0.0-M1
Closes gh-44159
2025-02-14 17:16:12 +01:00
Stéphane Nicoll 5e4d47363d Upgrade to REST Assured 5.5.1
Closes gh-44285
2025-02-14 17:16:11 +01:00
Stéphane Nicoll 4c917a5dd7 Upgrade to Prometheus Client 1.3.6
Closes gh-44284
2025-02-14 17:16:06 +01:00
Stéphane Nicoll 7c26ccd827 Upgrade to Flyway 11.3.2
Closes gh-44283
2025-02-14 17:16:01 +01:00
Stéphane Nicoll b22705975e Upgrade to Byte Buddy 1.17.1
Closes gh-44282
2025-02-14 17:15:55 +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 16f65ce853 Start building against Spring AMQP 3.2.3 snapshots
See gh-44279
2025-02-14 17:00:02 +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
Andy Wilkinson cefcdcfdd0 Polish RequestMatcherProvider deprecation javadoc
See gh-gh-29596
2025-02-14 07:44:47 +00: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 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 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 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
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
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 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 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 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