Commit Graph

27958 Commits

Author SHA1 Message Date
Andy Wilkinson 55c410abec Improve autoconfigure's use of test resources
Closes gh-44512
2025-03-05 16:40:26 +00:00
Andy Wilkinson 1eef4385ec Merge branch '3.3.x' into 3.4.x 2025-03-05 15:43:00 +00:00
Andy Wilkinson 1f5b9de302 Normalize the separator in resource names
See gh-44444
2025-03-05 15:42:41 +00:00
Andy Wilkinson 4043286f59 Merge branch '3.3.x' into 3.4.x 2025-03-05 14:51:50 +00:00
Andy Wilkinson 8e49a4e49a Increase independence of core auto-configuration tests
Remove some more references to Thymeleaf and FreeMarker
auto-configuration that were missed in 85ffbbc.

See gh-44513
2025-03-05 14:49:58 +00:00
Andy Wilkinson 0fb1d2bed7 Merge branch '3.3.x' into 3.4.x
Closes gh-44576
2025-03-05 14:34:50 +00:00
Andy Wilkinson bfd4e7b4ee Merge branch '3.3.x' into 3.4.x 2025-03-05 14:34:11 +00:00
Andy Wilkinson 85ffbbc384 Make core auto-configuration tests more independent
Closes gh-44513
2025-03-05 14:33:57 +00:00
Andy Wilkinson 5683d39fd6 Allow resources to hide existing resources with the same name
See gh-44444
2025-03-05 14:33:57 +00:00
Stéphane Nicoll 7912a03536 Upgrade to Neo4j Java Driver 5.28.2
Closes gh-44574
2025-03-05 15:17:38 +01:00
Stéphane Nicoll b077329bb4 Start building against Spring WS 4.0.12 snapshots
See gh-44573
2025-03-05 15:12:43 +01:00
Stéphane Nicoll 4e4f2ea9a3 Start building against Spring Security 6.4.4 snapshots
See gh-44572
2025-03-05 15:12:39 +01:00
Stéphane Nicoll ceffb0e24e Start building against Spring Pulsar 1.2.4 snapshots
See gh-44571
2025-03-05 15:12:35 +01:00
Stéphane Nicoll 3361f91d6b Start building against Spring Kafka 3.3.4 snapshots
See gh-44570
2025-03-05 15:12:31 +01:00
Stéphane Nicoll 3b1d3ee412 Start building against Spring Data Bom 2024.1.4 snapshots
See gh-44569
2025-03-05 15:12:27 +01:00
Stéphane Nicoll 18ec4ff1f4 Start building against Spring Batch 5.2.2 snapshots
See gh-44568
2025-03-05 15:12:23 +01:00
Stéphane Nicoll a205981299 Start building against Reactor Bom 2024.0.4 snapshots
See gh-44567
2025-03-05 15:12:19 +01:00
Stéphane Nicoll dc6822e7dd Start building against Micrometer Tracing 1.4.4 snapshots
See gh-44566
2025-03-05 15:12:15 +01:00
Stéphane Nicoll 6514ce0815 Start building against Micrometer 1.14.5 snapshots
See gh-44565
2025-03-05 15:12:11 +01:00
Stéphane Nicoll d5d27462ab Start building against Spring WS 4.0.12 snapshots
See gh-44564
2025-03-05 14:53:18 +01:00
Stéphane Nicoll a0f3850a7f Start building against Spring Security 6.3.8 snapshots
See gh-44563
2025-03-05 14:53:14 +01:00
Stéphane Nicoll 57e17adde0 Start building against Spring Pulsar 1.1.10 snapshots
See gh-44562
2025-03-05 14:53:11 +01:00
Stéphane Nicoll 08e9e4949b Start building against Spring Data Bom 2024.0.10 snapshots
See gh-44561
2025-03-05 14:53:07 +01:00
Stéphane Nicoll 057c30c561 Start building against Reactor Bom 2023.0.16 snapshots
See gh-44560
2025-03-05 14:53:03 +01:00
Stéphane Nicoll 37c4ea5c09 Start building against Micrometer Tracing 1.3.10 snapshots
See gh-44559
2025-03-05 14:52:59 +01:00
Stéphane Nicoll 8b1240331f Start building against Micrometer 1.13.12 snapshots
See gh-44558
2025-03-05 14:52:55 +01:00
Stéphane Nicoll 9a8d18c1ec Upgrade to Testcontainers 1.20.6
Closes gh-44557
2025-03-05 12:58:09 +01:00
Stéphane Nicoll 4dd58aaf96 Upgrade to SLF4J 2.0.17
Closes gh-44556
2025-03-05 12:58:05 +01:00
Stéphane Nicoll e104ad0a0c Upgrade to Pulsar 3.3.5
Closes gh-44555
2025-03-05 12:58:01 +01:00
Stéphane Nicoll 2476b9af0e Upgrade to Netty 4.1.119.Final
Closes gh-44554
2025-03-05 12:57:57 +01:00
Stéphane Nicoll 4d8ff528f1 Upgrade to Maven Install Plugin 3.1.4
Closes gh-44553
2025-03-05 12:57:53 +01:00
Stéphane Nicoll 1a11de9cf6 Upgrade to Maven Deploy Plugin 3.1.4
Closes gh-44552
2025-03-05 12:57:49 +01:00
Stéphane Nicoll ad5e56d3ce Upgrade to Logback 1.5.17
Closes gh-44551
2025-03-05 12:57:45 +01:00
Stéphane Nicoll f30c338a90 Upgrade to jOOQ 3.19.20
Closes gh-44550
2025-03-05 12:57:41 +01:00
Stéphane Nicoll 3e6a4a421e Upgrade to Infinispan 15.0.14.Final
Closes gh-44548
2025-03-05 12:57:33 +01:00
Stéphane Nicoll 26fcd2dcc3 Upgrade to Hibernate 6.6.9.Final
Closes gh-44547
2025-03-05 12:57:29 +01:00
Stéphane Nicoll 33e7238f26 Upgrade to Groovy 4.0.26
Closes gh-44546
2025-03-05 12:57:25 +01:00
Stéphane Nicoll 497aef8668 Upgrade to SLF4J 2.0.17
Closes gh-44545
2025-03-05 12:52:11 +01:00
Stéphane Nicoll b199fabfd2 Upgrade to Netty 4.1.119.Final
Closes gh-44544
2025-03-05 12:52:07 +01:00
Stéphane Nicoll dacc4915cb Upgrade to Maven Install Plugin 3.1.4
Closes gh-44543
2025-03-05 12:52:03 +01:00
Stéphane Nicoll 4fb21b34cf Upgrade to Maven Deploy Plugin 3.1.4
Closes gh-44542
2025-03-05 12:51:59 +01:00
Stéphane Nicoll cc6cfea102 Upgrade to Logback 1.5.17
Closes gh-44541
2025-03-05 12:51:55 +01:00
Stéphane Nicoll f0e006e86d Upgrade to jOOQ 3.19.20
Closes gh-44540
2025-03-05 12:51:51 +01:00
Stéphane Nicoll 23787db03a Upgrade to Infinispan 15.0.14.Final
Closes gh-44539
2025-03-05 12:51:48 +01:00
Stéphane Nicoll b28794e331 Upgrade to Groovy 4.0.26
Closes gh-44538
2025-03-05 12:51:43 +01:00
Moritz Halbritter d453a59724 Merge branch '3.3.x' into 3.4.x
Closes gh-44536
2025-03-05 11:56:21 +01:00
Tran Ngoc Nhan 701f73fcd7 Fix JavaExec javadoc link
See gh-44526

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-03-05 11:55:29 +01:00
Andy Wilkinson d92551f15a Merge branch '3.3.x' into 3.4.x
Closes gh-44530
2025-03-04 18:03:07 +00:00
Andy Wilkinson 3715eb8df2 Merge branch '3.3.x' into 3.4.x
Closes gh-44528
2025-03-04 18:02:23 +00:00
Andy Wilkinson 27779bec0a Remove AutoConfigurationReproTests
Removed in favor of WebServerFactoryCustomizerBeanPostProcessorTests
which, through the expectations that it sets up on the mock bean
factory, already checks that early initialization will not be
triggered.

Closes gh-44511
2025-03-04 17:50:19 +00:00
Andy Wilkinson c9f3688df9 Remove redundant tests
Closes gh-44520
2025-03-04 17:45:23 +00:00
Stéphane Nicoll c1f58d1f80 Merge branch '3.3.x' into 3.4.x
Closes gh-44523
2025-03-04 15:30:53 +01:00
Matthias Streidel 474dafae28 Fix typo
See gh-44514

Signed-off-by: Matthias Streidel <github@metters.slmail.me>
2025-03-04 15:30:27 +01:00
Stéphane Nicoll d49617063a Adapt to change in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/34513

See gh-44481
2025-03-04 12:18:01 +01:00
Stéphane Nicoll e69683769e Start building against Spring Framework 6.1.18 snapshots
See gh-44491
2025-02-28 14:42:46 +01:00
Andy Wilkinson be6eb5875e Merge branch '3.3.x' into 3.4.x 2025-02-28 12:25:32 +00:00
Andy Wilkinson 7d01c941b9 Use WithPackageResources on shouldUpdateSslWhenReloadingSslBundles
See gh-44397
2025-02-28 12:23:17 +00:00
Tran Ngoc Nhan 0f4e361a95 Fix typo in javadoc
See gh-44469

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-02-28 11:48:47 +01:00
Moritz Halbritter f6f1a9ffac Merge branch '3.3.x' into 3.4.x
Closes gh-44483
2025-02-28 11:20:37 +01:00
Benjamin König 23fd79f425 Remove obsolete hints for Flyway Teams features
See gh-44460

Signed-off-by: Benjamin König <koenig87@googlemail.com>
2025-02-28 11:18:41 +01:00
Stéphane Nicoll d03847c2c7 Merge branch '3.3.x' into 3.4.x
Closes gh-44481
2025-02-28 11:10:31 +01:00
Stéphane Nicoll e1f45c50ee Generate reflection hints for main methods
This commit makes sure to register the necessary hints to invoke the
main method of any bean available in the context. This is necessary
for tests that use the UseMainMethod feature.

This generates more hints than strictly necessary as there isn't a
way to contribute hints based on a ContextLoader, see
https://github.com/spring-projects/spring-framework/issues/34513 for
more details.

Closes gh-44461
2025-02-28 11:08:23 +01:00
Moritz Halbritter c91c8e202a Fix tests 2025-02-28 10:53:54 +01:00
Moritz Halbritter d2d8978170 Merge branch '3.3.x' into 3.4.x
Closes gh-44478
2025-02-28 10:36:39 +01:00
Dmitry Sulman 7276be825a Update version of Neo4j test container image
See gh-44463

Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-02-28 10:35:55 +01:00
Moritz Halbritter da361efd3f Merge branch '3.3.x' into 3.4.x
Closes gh-44475
2025-02-28 10:32:20 +01:00
Dmitry Sulman c98f9ac126 Update version of Elasticsearch test container image
See gh-44459

Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-02-28 10:31:07 +01:00
Moritz Halbritter 19ba2ec0e9 Merge pull request #44467 from nosan
* pr/44467:
  Close InputStream when loading Log4j2 Configuration from a Resource

Closes gh-44467
2025-02-28 10:30:57 +01:00
Moritz Halbritter 589bf2cafc Merge branch '3.3.x' into 3.4.x
Closes gh-44473
2025-02-28 10:13:59 +01:00
Dmytro Nosan be7e952e91 Close InputStream when loading Log4j2 Configuration from a Resource
See gh-44467

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 09:57:09 +01:00
Andy Wilkinson cbf9cb04b4 Merge branch '3.3.x' into 3.4.x
See gh-44448
2025-02-27 10:50:42 +00:00
Andy Wilkinson 21a5319362 Revert "Use Framework's default class loader as default in ImportCandidates"
This reverts commit 56c955158d.

See gh-44401
2025-02-27 10:50:17 +00:00
Stéphane Nicoll facda3dca9 Adapt to change in exception hierarchy
See gh-44442
2025-02-27 09:38:26 +01:00
Andy Wilkinson 608b6c4852 Merge branch '3.3.x' into 3.4.x
Closes gh-44456
2025-02-26 18:29:37 +00:00
Andy Wilkinson 3de189a1df Minimize test resources and move remainder to appropriate packages
Closes gh-44397
2025-02-26 15:49:42 +00:00
Andy Wilkinson 4d137d4456 Merge branch '3.3.x' into 3.4.x
Closes gh-44454
2025-02-26 15:45:47 +00:00
Andy Wilkinson 8577718b22 Close InputStream when loading PEM content from a resource
Fixes gh-44443
2025-02-26 15:45:24 +00:00
Andy Wilkinson 9c189a0550 Merge branch '3.3.x' into 3.4.x
Closes gh-44452
2025-02-26 15:44:03 +00:00
Andy Wilkinson 88745820d3 Close InputStream after reading banner resource
Fixes gh-44441
2025-02-26 15:43:42 +00:00
Andy Wilkinson 0e066ac9b4 Merge branch '3.3.x' into 3.4.x
Closes gh-44450
2025-02-26 15:42:46 +00:00
Andy Wilkinson 5be5eaf7f2 Use ClassLoader from ResourceLoader to load PropertySourceLoaders
Fixes gh-44427
2025-02-26 15:42:12 +00:00
Andy Wilkinson 4f0dd516b4 Merge branch '3.3.x' into 3.4.x
Closes gh-44448
2025-02-26 15:39:26 +00:00
Andy Wilkinson 56c955158d Use Framework's default class loader as default in ImportCandidates
Closes gh-44401
2025-02-26 15:32:50 +00:00
Andy Wilkinson 23b89c8cb3 Merge branch '3.3.x' into 3.4.x
Closes gh-44445
2025-02-26 15:31:04 +00:00
Andy Wilkinson 3acea583ad Add support for working with resources in tests
Closes gh-44444
2025-02-26 15:29:20 +00:00
Stéphane Nicoll d04620d5b3 Polish test
Include at least a bean declaration to make sure the cglib proxy is
created
2025-02-26 15:15:30 +01:00
Moritz Halbritter 8705ed0ecc Merge branch '3.3.x' into 3.4.x
Closes gh-44436
2025-02-26 11:49:59 +01:00
Moritz Halbritter abf320d273 Register reflection hints for SslBundleSslEngineFactory
Closes gh-44435
2025-02-26 11:46:55 +01:00
Moritz Halbritter ea25734599 Merge branch '3.3.x' into 3.4.x
Closes gh-44437
2025-02-26 11:28:49 +01:00
Moritz Halbritter 453002b77b Add class of SslBundleSslEngineFactory to Kafka config map
Closes gh-44414
2025-02-26 10:46:12 +01:00
Stéphane Nicoll a5ed3e6aed Merge branch '3.3.x' into 3.4.x
Closes gh-44420
2025-02-24 08:23:45 +01:00
Stéphane Nicoll 41656bf4ee Update copyright of changed files
See gh-44413
2025-02-24 08:21:07 +01:00
Tran Ngoc Nhan ae2cfebd93 Fix typo in fold attribute
See gh-44413

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-02-24 08:19:57 +01:00
Stéphane Nicoll f235d7e9ff Merge branch '3.3.x' into 3.4.x
Closes gh-44416
2025-02-24 08:01:46 +01:00
Stéphane Nicoll bf1dc09c86 Update copyright of changed files
See gh-44323
2025-02-24 07:52:35 +01:00
Johnny Lim 332ad7bb70 Polish
See gh-44323

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-24 07:46:25 +01:00
Stéphane Nicoll de32c6ff79 Merge branch '3.3.x' into 3.4.x
Closes gh-44409
2025-02-22 19:05:07 +01:00
Tran Ngoc Nhan d781ce164d Use Javadoc attributes for Gradle reference guide
See gh-44388

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-02-22 19:02:33 +01:00
Stéphane Nicoll 2c4ea4c749 Merge branch '3.3.x' into 3.4.x
Closes gh-44407
2025-02-22 18:56:34 +01:00
Stéphane Nicoll 2a94ee1586 Polish contribution
See gh-44348
2025-02-22 18:53:51 +01:00
Bernie Schelberg b9438bef9e Consider properties on outer class in nested @DataJpaTest tests
See gh-44348

Signed-off-by: Bernie Schelberg <bernard.schelberg@invicara.com>
2025-02-22 18:53:39 +01:00
Stéphane Nicoll 56bd551ce9 Update copyright year of changed file
See gh-44393
2025-02-22 18:43:30 +01:00
Johnny Lim 133ecab3cf Replace unconventional Optional usages
See gh-44393

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-22 18:40:47 +01:00
Stéphane Nicoll f7b23f548d Merge branch '3.3.x' into 3.4.x
Closes gh-44404
2025-02-22 18:38:10 +01:00
Stéphane Nicoll 7fd19556b2 Polish contribution
See gh-44384
2025-02-22 18:33:05 +01:00
Dmytro Nosan 2f288bf614 Clarify which Mongo properties are ignored when URI property is set
See gh-44384

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-22 18:28:42 +01:00
Stéphane Nicoll 397ded2e6d Merge branch '3.3.x' into 3.4.x
Closes gh-44402
2025-02-22 18:25:18 +01:00
Tran Ngoc Nhan c211b05660 Adapt reference to JooqExceptionTranslator
This commit updates the reference guide as JooqExceptionTranslator has
been superseded by ExceptionTranslatorExecuteListener.

See gh-44385

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-02-22 18:22:14 +01:00
Dmytro Nosan 22958097e3 Register Log42J StatusListener
Update Log42JLoggingSystem to register Boot's StatusListener
instead of resetting the fallbackListener during initialization.

This fixes an issue when resetting the fallback listener leads to
closing standard streams.

See gh-44380

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-20 11:35:19 +00:00
Phillip Webb c74397af1a Merge branch '3.3.x' into 3.4.x 2025-02-19 15:53:15 -08:00
Phillip Webb c718461450 Protect against NoSuchMethodException on setReadOnly
See gh-44331
2025-02-19 15:52:51 -08:00
Andy Wilkinson 7dc9bf29b8 Upgrade to Testcontainers Redis Module 2.2.4
Closes gh-44370
2025-02-19 23:13:20 +00:00
Andy Wilkinson 7d1fc062bf Upgrade to Testcontainers 1.20.5
Closes gh-44369
2025-02-19 23:13:15 +00:00
Andy Wilkinson d016764b1f Upgrade to jOOQ 3.19.19
Closes gh-44368
2025-02-19 23:13:11 +00:00
Andy Wilkinson 69abb7dda7 Upgrade to Spring Session 3.3.6
Closes gh-44114
2025-02-19 23:10:49 +00:00
Andy Wilkinson ff4babc4d1 Upgrade to jOOQ 3.19.19
Closes gh-44367
2025-02-19 23:10:49 +00:00
Andy Wilkinson ce31617038 Upgrade to Tomcat 10.1.36
Closes gh-44333
2025-02-19 12:43:21 -08:00
Andy Wilkinson 9704afbe2a Upgrade to Tomcat 10.1.36
Closes gh-44331
2025-02-19 12:42:49 -08:00
Phillip Webb 792c13eaf0 Merge branch '3.3.x' into 3.4.x
Closes gh-44364
2025-02-19 12:21:04 -08:00
Dmytro Nosan e919fd806f Polish ClassPath
See gh-44355

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-19 12:20:10 -08:00
Andy Wilkinson 343d1ea46b Merge branch '3.3.x' into 3.4.x
Closes gh-44358
2025-02-19 15:51:08 +00:00
Andy Wilkinson cfc12bfef7 Remove unused empty-web.xml
Closes gh-44357
2025-02-19 15:50:33 +00:00
Stéphane Nicoll b5d50ebf7a Upgrade to Spring Kafka 3.2.7
Closes gh-44110
2025-02-19 09:45:31 +01:00
Stéphane Nicoll c31872cd2f Upgrade to Spring Integration 6.3.8
Closes gh-44109
2025-02-19 09:45:31 +01:00
Stéphane Nicoll d89d1aa332 Upgrade to Spring Authorization Server 1.3.5
Closes gh-44105
2025-02-19 09:45:31 +01:00
Stéphane Nicoll 55c9603387 Upgrade to Spring AMQP 3.1.9
Closes gh-44277
2025-02-19 09:45:31 +01:00
Stéphane Nicoll a686ae4937 Upgrade to Spring Kafka 3.3.3
Closes gh-44123
2025-02-19 09:44:48 +01:00
Stéphane Nicoll 339f6207ae Upgrade to Spring Integration 6.4.2
Closes gh-44122
2025-02-19 09:44:48 +01:00
Stéphane Nicoll 3a2613f373 Upgrade to Spring Authorization Server 1.4.2
Closes gh-44118
2025-02-19 09:44:48 +01:00
Stéphane Nicoll 2abc3dec6f Upgrade to Spring AMQP 3.2.3
Closes gh-44278
2025-02-19 09:44:48 +01:00
Stéphane Nicoll 5f15e979e0 Upgrade to Maven Clean Plugin 3.4.1
Closes gh-44349
2025-02-19 09:44:48 +01:00
Phillip Webb 8c6e856340 Fix formatting 2025-02-18 17:44:24 -08:00
Phillip Webb 661fcfe033 Merge branch '3.3.x' into 3.4.x 2025-02-18 17:29:31 -08:00
Phillip Webb 082c5859e8 Polish 2025-02-18 17:22:53 -08:00
Phillip Webb eeced8c629 Merge branch '3.3.x' into 3.4.x 2025-02-18 15:11:51 -08:00
Phillip Webb 8aea6d575a Update copyright year of changed files 2025-02-18 15:11:35 -08:00
Andy Wilkinson 13bfc0442b Merge branch '3.3.x' into 3.4.x
Closes gh-44333
2025-02-18 21:14:20 +00:00
Andy Wilkinson bba964cd12 Prohibit upgrades to Tomcat 10.1.35 and 10.1.36
Closes gh-44331
2025-02-18 21:14:15 +00:00
Phillip Webb e4077cb2e9 Merge branch '3.3.x' into 3.4.x
Closes gh-44345
2025-02-18 12:11:48 -08:00
Dmytro Nosan 0e81b6386e Don't use ArgFile when using JavaCompiler
See gh-44340

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-18 12:10:41 -08:00
Phillip Webb bac9217b14 Merge branch '3.3.x' into 3.4.x
Closes gh-44343
2025-02-18 12:09:48 -08:00
Dmytro Nosan 616d4cb149 Polish ClasspathBuilder
See gh-44330

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-18 12:08:49 -08:00
Andy Wilkinson 213383ce26 Merge branch '3.3.x' into 3.4.x 2025-02-18 17:55:13 +00:00
Andy Wilkinson b6abb42ec9 Remove redundant prohibiting of Tomcat version
See gh-44331
2025-02-18 17:54:11 +00:00
Andy Wilkinson 13f254b289 Upgrade to Spring Session 3.4.2
Closes gh-44127
2025-02-18 17:44:22 +00:00
Andy Wilkinson b36b64b7ea Upgrade to Spring Security 6.4.3
Closes gh-44126
2025-02-18 17:44:21 +00:00
Andy Wilkinson a9b6b34482 Upgrade to Spring Pulsar 1.2.3
Closes gh-44125
2025-02-18 17:44:21 +00:00
Andy Wilkinson 1f65d41b18 Upgrade to Spring GraphQL 1.3.4
Closes gh-44121
2025-02-18 17:44:21 +00:00
Andy Wilkinson d12a33a2d9 Upgrade to Hibernate 6.6.8.Final
Closes gh-44332
2025-02-18 17:44:20 +00:00
Andy Wilkinson 7ba2d873a8 Upgrade to Spring Security 6.3.7
Closes gh-44113
2025-02-18 17:40:33 +00:00
Andy Wilkinson 99744ec9d8 Upgrade to Spring Pulsar 1.1.9
Closes gh-44112
2025-02-18 17:40:33 +00:00
Andy Wilkinson e1d79e80bb Upgrade to Spring GraphQL 1.3.4
Closes gh-44108
2025-02-18 17:40:33 +00:00
Stéphane Nicoll 1a4af5626c Merge branch '3.3.x' into 3.4.x 2025-02-18 17:00:28 +01:00
Stéphane Nicoll 29e498b6bc Only run Windows-related tests on Windows
See gh-44305
2025-02-18 16:59:32 +01:00
Stéphane Nicoll 332958a8de Merge branch '3.3.x' into 3.4.x
Closes gh-44328
2025-02-18 16:31:12 +01:00
Stéphane Nicoll cd8c12da0b Polish "Use ArgFile for classpath argument on Windows"
See gh-44305
2025-02-18 16:25:57 +01:00
Dmytro Nosan a6b80831f0 Use ArgFile for classpath argument on Windows
This commit uses @argfile syntax for classpath argument on Windows OS
to avoid creating a command-line that is too long.

See gh-44305

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-18 16:25:57 +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 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 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
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
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
Stéphane Nicoll fafcfb41c8 Upgrade to Testcontainers Redis Module 2.2.3
Closes gh-44182
2025-02-08 15:48:44 +01:00
Stéphane Nicoll c1cda666e7 Upgrade to RSocket 1.1.5
Closes gh-44181
2025-02-08 15:48:44 +01:00
Stéphane Nicoll e91705a04d Upgrade to R2DBC MySQL 1.3.2
Closes gh-44180
2025-02-08 15:47:58 +01:00
Stéphane Nicoll ff6168cde7 Upgrade to Native Build Tools Plugin 0.10.5
Closes gh-44179
2025-02-08 15:47:58 +01:00
Stéphane Nicoll 08e5578157 Upgrade to Infinispan 15.0.13.Final
Closes gh-44178
2025-02-08 15:45:06 +01:00
Stéphane Nicoll 15099d0755 Upgrade to HttpCore5 5.3.3
Closes gh-44177
2025-02-08 15:45:02 +01:00
Stéphane Nicoll 75c06f224c Upgrade to HttpClient5 5.4.2
Closes gh-44176
2025-02-08 15:44:58 +01:00
Stéphane Nicoll 54a11aba6e Upgrade to Hibernate 6.6.6.Final
Closes gh-44175
2025-02-08 15:44:54 +01:00
Stéphane Nicoll f3de1a121f Upgrade to Groovy 4.0.25
Closes gh-44174
2025-02-08 15:44:50 +01:00
Stéphane Nicoll 16467c4f90 Upgrade to Commons Pool2 2.12.1
Closes gh-44173
2025-02-08 15:44:46 +01:00
Andy Wilkinson cc5414826a Merge branch '3.3.x' into 3.4.x
Closes gh-44170
2025-02-08 10:08:43 +00:00
Tran Ngoc Nhan b5fa849563 Link to JarLauncher's javadoc
See gh-44168

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-02-08 10:08:05 +00:00
Moritz Halbritter 4fbbc3eda1 Clean up duplicate JsonView entry 2025-02-06 15:40:05 +01:00
Moritz Halbritter 8552bc0d78 Merge branch '3.3.x' into 3.4.x 2025-02-06 14:27:06 +01:00
Moritz Halbritter 461e30f668 Add JsonView to PluginClasspathGradleBuild 2025-02-06 14:26:51 +01:00
Moritz Halbritter 1b494cc61d Merge branch '3.3.x' into 3.4.x
Closes gh-44145
2025-02-06 12:21:58 +01:00
Moritz Halbritter baf596d10e Document double observations when using @Timed etc.
Closes gh-44037
2025-02-06 12:21:31 +01:00
Stéphane Nicoll dbc61d39f0 Upgrade to RSocket 1.1.5
Closes gh-44041
2025-02-05 14:57:50 +01:00
Stéphane Nicoll b46698774d Upgrade to Native Build Tools Plugin 0.10.5
Closes gh-44141
2025-02-05 14:57:50 +01:00
Stéphane Nicoll fcd33e8b30 Upgrade to Infinispan 15.0.13.Final
Closes gh-44140
2025-02-05 12:28:16 +01:00
Stéphane Nicoll 3e4a799bb9 Upgrade to Groovy 4.0.25
Closes gh-44139
2025-02-05 12:28:12 +01:00
Stéphane Nicoll c80c08d7bd Upgrade to Commons Pool2 2.12.1
Closes gh-44138
2025-02-05 12:28:08 +01:00
Stéphane Nicoll 2834367cb8 Start building against Spring Session 3.4.2 snapshots
See gh-44127
2025-02-05 10:05:15 +01:00
Stéphane Nicoll 5999cd7109 Start building against Spring Security 6.4.3 snapshots
See gh-44126
2025-02-05 10:05:15 +01:00
Stéphane Nicoll ce47bbc2ee Start building against Spring Pulsar 1.2.3 snapshots
See gh-44125
2025-02-05 10:05:14 +01:00
Stéphane Nicoll e9c36ccf38 Start building against Spring LDAP 3.2.11 snapshots
See gh-44124
2025-02-05 10:05:14 +01:00
Stéphane Nicoll 1d85aa42a9 Start building against Spring Kafka 3.3.3 snapshots
See gh-44123
2025-02-05 10:05:14 +01:00
Stéphane Nicoll 38f55c3080 Start building against Spring Integration 6.4.2 snapshots
See gh-44122
2025-02-05 10:05:14 +01:00
Stéphane Nicoll ac9571a033 Start building against Spring GraphQL 1.3.4 snapshots
See gh-44121
2025-02-05 10:05:14 +01:00
Stéphane Nicoll 9feb2de604 Start building against Spring Data Bom 2024.1.3 snapshots
See gh-44119
2025-02-05 10:05:14 +01:00
Stéphane Nicoll bec776e024 Start building against Spring Authorization Server 1.4.2 snapshots
See gh-44118
2025-02-05 10:05:14 +01:00