Commit Graph

28442 Commits

Author SHA1 Message Date
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 98e60b5607 Merge branch '3.4.x'
Closes gh-44479
2025-02-28 10:36:57 +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 b9bf4a557e Merge branch '3.4.x'
Closes gh-44476
2025-02-28 10:32:48 +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 92e18df7f0 Merge branch '3.4.x'
Closes gh-44474
2025-02-28 10:23:00 +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
Moritz Halbritter b2d7a13b9d Polish "Use Console charset for console logging when available"
See gh-44353
2025-02-28 09:26:23 +01:00
Dmytro Nosan a250bbb7e4 Use Console charset for console logging when available
Prior to this commit, LogbackLoggingSystemProperties
doesn't respect Console.charset(). It used Charset.getDefaultCharset()
for logback and  UTF-8 for log42j as defaults.

This commit changes the behaviour of LogbackLoggingSystemProperties to use
 Console.charset() when available. If no console is present, the default
 charset is used instead.

These changes bring consistency across logging implementations.

See gh-43118

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 08:27:40 +01:00
Andy Wilkinson 93648792b1 Switch to management.opentelemetry.resource-attributes in tests
See gh-44468
2025-02-27 20:21:47 +00:00
Andy Wilkinson 51885c9d38 Remove deprecated management.otlp.metrics.export.resource-attributes
It was deprecated in 3.2 and should have been removed in 3.4 so its
removal is overdue.

Closes gh-44468
2025-02-27 19:01:10 +00:00
Andy Wilkinson 8eb8d3f281 Merge branch '3.4.x'
See gh-44449
2025-02-27 10:51:06 +00: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 f45a3d7180 Merge branch '3.4.x'
Closes gh-44457
2025-02-26 18:47:19 +00: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 2dac97a8bc Merge branch '3.4.x'
Closes gh-44455
2025-02-26 15:46:01 +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 3d81a8d848 Merge branch '3.4.x'
Closes gh-44453
2025-02-26 15:44:16 +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 4ffb29a924 Merge branch '3.4.x'
Closes gh-44451
2025-02-26 15:42:58 +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 65dbff1729 Merge branch '3.4.x'
Closes gh-44449
2025-02-26 15:39:57 +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 a5ff2a94f0 Merge branch '3.4.x'
Closes gh-44446
2025-02-26 15:31:17 +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 026c0b2a64 Merge branch '3.4.x' 2025-02-26 15:27:15 +01: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 79ec0ea182 Merge branch '3.4.x'
Closes gh-44440
2025-02-26 11:50:57 +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 e7d9f195d2 Merge branch '3.4.x'
Closes gh-44438
2025-02-26 11:35:08 +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
Tyler Gregory 9199fecae3 Ensure StandardStackTracePrinter respects stacktrace.root configuration property
See gh-44398

Signed-off-by: Tyler Gregory <tyler.w.gregory@gmail.com>
2025-02-25 14:27:28 +01:00
Dmytro Nosan 35db02bf48 Add spring.data.mongodb.protocol property
This commit allows configuring the MongoDB connection
protocol using the 'spring.data.mongodb.protocol' property.

See gh-44366

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-25 14:02:29 +01:00
Moritz Halbritter 3be5e6cc3e Polish "Improve logging in DockerApi"
See gh-44412
2025-02-25 13:14:38 +01:00
Dmytro Nosan 9a940702bc Improve logging in DockerApi
This commit introduces a new constructor in `DockerApi`
that accepts `DockerLogger` as a parameter.

The `DockerLogger` is a pretty simple callback interface used to
provide DockerApi output logging.

See gh-44412

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-25 13:07:23 +01:00
Johnny Lim 7baadb5038 Remove NoSuchMethodError guard for Context.setCreateUploadTargets()
See gh-44426

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-25 09:16:31 +01:00
Stéphane Nicoll 5e57f1bb7b Merge branch '3.4.x'
Closes gh-44421
2025-02-24 08:23:53 +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 ed5ec225a7 Merge branch '3.4.x'
Closes gh-44417
2025-02-24 08:04:36 +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 48e3de0cd1 Merge branch '3.4.x'
Closes gh-44410
2025-02-22 19:05:14 +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 11cdc63560 Merge branch '3.4.x'
Closes gh-44408
2025-02-22 18:56:42 +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 be0e6722b8 Merge branch '3.4.x'
Closes gh-44406
2025-02-22 18:48: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 7ac438547f Merge branch '3.4.x'
Closes gh-44405
2025-02-22 18:38:18 +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 742ea17340 Merge branch '3.4.x'
Closes gh-44403
2025-02-22 18:25:29 +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
Tyler Gregory 6e6d8de8ed Fixing typos in StandardStackTracePrinter
See gh-44396

Signed-off-by: Tyler Gregory <tyler.w.gregory@gmail.com>
2025-02-21 18:30:43 +01:00
Andy Wilkinson cc63f83542 Merge branch '3.4.x'
Closes gh-44381
2025-02-20 11:36:00 +00: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 fa90bbaae1 Merge branch '3.4.x' 2025-02-19 15:53:25 -08: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 b70b61ee08 Upgrade to Testcontainers Redis Module 2.2.4
Closes gh-44376
2025-02-19 23:21:48 +00:00
Andy Wilkinson 7a67ffb925 Upgrade to Testcontainers 1.20.5
Closes gh-44375
2025-02-19 23:21:48 +00:00
Andy Wilkinson a09f1c179e Upgrade to Spring Authorization Server 1.5.0-M1
Closes gh-44374
2025-02-19 23:21:48 +00:00
Andy Wilkinson e9a2831bc2 Upgrade to Lettuce 6.5.4.RELEASE
Closes gh-44373
2025-02-19 23:21:48 +00:00
Andy Wilkinson 0f98dd6a89 Upgrade to Flyway 11.3.3
Closes gh-44371
2025-02-19 23:16:49 +00: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 eba12f4ebf Upgrade to Tomcat 10.1.36
Closes gh-44339
2025-02-19 12:44:52 -08: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 360927186e Merge branch '3.4.x'
Closes gh-44365
2025-02-19 12:21:13 -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 a19bec645a Merge branch '3.4.x'
Closes gh-44359
2025-02-19 15:51:20 +00: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
Moritz Halbritter ae16856bda Revert "Use noble buildpacks instead of jammy"
This reverts commit 4f672b9588.

See gh-42711
2025-02-19 16:00:27 +01:00
Moritz Halbritter 4f672b9588 Use noble buildpacks instead of jammy
Closes gh-42711
2025-02-19 13:59:21 +01: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 653c9e9480 Upgrade to SQLite JDBC 3.49.1.0
Closes gh-44351
2025-02-19 09:45:19 +01:00
Stéphane Nicoll 473515cad2 Upgrade to Spring Kafka 3.3.3
Closes gh-44163
2025-02-19 09:45:14 +01:00
Stéphane Nicoll 04cec83dd6 Upgrade to Spring Integration 6.5.0-M2
Closes gh-44162
2025-02-19 09:45:14 +01:00
Stéphane Nicoll 2d3aa07704 Upgrade to Spring Authorization Server 1.4.2
Closes gh-44158
2025-02-19 09:45:14 +01:00
Stéphane Nicoll 39e9fd4251 Upgrade to Spring AMQP 3.2.3
Closes gh-44279
2025-02-19 09:45:14 +01:00
Stéphane Nicoll c5a7fa70ee Upgrade to Maven Clean Plugin 3.4.1
Closes gh-44350
2025-02-19 09:45:14 +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
Moritz Halbritter 53405a48c2 Add property to configure Spring Kafka's authExceptionRetryInterval
Closes gh-44199
2025-02-19 09:14:57 +01:00
Phillip Webb 8c132711e4 Merge branch '3.4.x' 2025-02-18 17:44:28 -08:00
Phillip Webb 8c6e856340 Fix formatting 2025-02-18 17:44:24 -08:00
Phillip Webb 6076e9e2c1 Merge branch '3.4.x' 2025-02-18 17:29:38 -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 651a39b3f6 Merge branch '3.4.x' 2025-02-18 15:12:07 -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 e76bf84278 Merge branch '3.4.x'
Closes gh-44339
2025-02-18 21:17:14 +00: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 a3eccf63a1 Merge branch '3.4.x'
Closes gh-44346
2025-02-18 12:11:54 -08: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 39aac00151 Merge branch '3.4.x'
Closes gh-44344
2025-02-18 12:10:01 -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 20a6ddd03a Merge branch '3.4.x' 2025-02-18 17:55:57 +00: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 1623ea17df Upgrade to Spring Session 3.4.2
Closes gh-44167
2025-02-18 17:53:49 +00:00
Andy Wilkinson e18d387953 Upgrade to Spring Security 6.5.0-M2
Closes gh-44166
2025-02-18 17:53:49 +00:00
Andy Wilkinson 33d7d5e6ec Upgrade to Spring Pulsar 1.2.3
Closes gh-44165
2025-02-18 17:53:48 +00:00
Andy Wilkinson ac5cad67a0 Upgrade to Spring GraphQL 1.3.4
Closes gh-44161
2025-02-18 17:53:48 +00:00
Andy Wilkinson 8f8ae13ce8 Upgrade to Liquibase 4.31.1
Closes gh-44337
2025-02-18 17:53:43 +00:00
Andy Wilkinson 2d6b0d417e Upgrade to Hibernate 6.6.8.Final
Closes gh-44336
2025-02-18 17:53:38 +00:00
Andy Wilkinson 3abe8a46cd Upgrade to Brave 6.1.0
Closes gh-44335
2025-02-18 17:53:32 +00:00
Andy Wilkinson 01c4ebd177 Upgrade to Zipkin Reporter 3.5.0
Closes gh-44334
2025-02-18 17:53:28 +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 2997bb8836 Merge branch '3.4.x' 2025-02-18 17:00:35 +01: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 cb346d5860 Merge branch '3.4.x'
Closes gh-44329
2025-02-18 16:31:25 +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 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
Phillip Webb 28495d7d13 Polish `SanitizingFunction`
See gh-39243
2025-02-11 19:26:29 -08:00
Phillip Webb 3eee1f1ad0 Add convenience methods to `SanitizingFunction`
Add a `sanitizeValue()` factory method and `if...` methods that can
be used to quickly build a `SanitizingFunction`.

Closes gh-39243
2025-02-11 19:05:42 -08:00
Stéphane Nicoll 60adee359a Upgrade to SQLite JDBC 3.49.0.0
Closes gh-44232
2025-02-11 15:43:20 +01:00
Stéphane Nicoll bc36485e6a Upgrade to Reactor Bom 2024.0.3
Closes gh-44157
2025-02-11 15:43:20 +01:00
Stéphane Nicoll cf3b74ec76 Upgrade to Rabbit AMQP Client 5.25.0
Closes gh-44231
2025-02-11 15:43:20 +01:00
Stéphane Nicoll fc05658cd5 Upgrade to Oracle Database 23.7.0.25.01
Closes gh-44230
2025-02-11 15:43:20 +01:00
Stéphane Nicoll 90309394ef Upgrade to OpenTelemetry 1.47.0
Closes gh-44229
2025-02-11 15:29:41 +01:00
Stéphane Nicoll 11ca7949b8 Upgrade to Netty 4.1.118.Final
Closes gh-44228
2025-02-11 15:29:40 +01:00
Stéphane Nicoll e4da89cfa9 Upgrade to Micrometer Tracing 1.5.0-M2
Closes gh-44156
2025-02-11 15:29:40 +01:00
Stéphane Nicoll e180e7aff2 Upgrade to Micrometer 1.15.0-M2
Closes gh-44155
2025-02-11 15:29:40 +01:00
Stéphane Nicoll c22033440f Upgrade to Hibernate 6.6.7.Final
Closes gh-44227
2025-02-11 15:29:40 +01:00
Stéphane Nicoll 3b37805dc3 Merge branch '3.4.x'
Closes gh-44225
2025-02-11 15:18:36 +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 5fc442471a Upgrade to Elasticsearch Client 8.17.1
Closes gh-44217
2025-02-11 12:42:18 +00:00
Andy Wilkinson 24ead90e13 Merge branch '3.4.x'
Closes gh-44216
2025-02-11 12:31:19 +00: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 0be4062116 Merge branch '3.4.x'
Closes gh-44213
2025-02-11 11:35:12 +00:00
Andy Wilkinson 30d7af4e38 Add CI with Java 24
Closes gh-44205
2025-02-11 11:34:43 +00:00
Andy Wilkinson 8dc21cf219 Merge branch '3.4.x'
Closes gh-44210
2025-02-11 11:03:28 +00:00
Andy Wilkinson c5d21e0e63 Add TWENTY_FOUR to JavaVersion enum
Closes gh-44209
2025-02-11 11:03:02 +00:00
Andy Wilkinson 7c27cc52ee Try to fix Windows build failures
Text blocks use \n as their separator on all platforms. Update
withLineSeparatorUsesLineSeparator() to replace \n rather than
System.lineSeparator()

createPrinterWhenStandardAppliesCustomizations() limits the length of
the output. On Windows, the default \r\n line separator uses an
extra byte per separator compared to \n. Configure the printer to use
\n as a line separator so that non-whitespace output is the same on
all platforms.

See gh-43864
2025-02-11 09:43:59 +00:00
Phillip Webb 491a335ec7 Attempt to fix Windows build failures
See gh-43864
2025-02-10 23:29:55 -08:00
Phillip Webb 7433b93769 Add stack trace printer support for structured logging
Introduce a new `StackTracePrinter` interface (and a standard
implementation) that can be used to print stack traces in a custom
form. The existing `StructuredLoggingJsonProperties` have been updated
with a nested `StackTrace` record that supports common customization
options or allows a custom `StackTracePrinter` to be used.

Closes gh-43864
2025-02-10 22:34:28 -08:00
Phillip Webb 291e5d8bd3 Polish 2025-02-10 17:02:01 -08:00
Brian Clozel afcc780e61 Write TraceId in HTTP Response headers
Prior to this commit, the Micrometer instrumentation support would
auto-configure a `ServerHttpObservationFilter` for creating observations
in Spring MVC applications.

As of Spring Framework 6.2, applications can extend this filter class to
get notified of the observation scope being opened.
This commit contributes a new `TraceHeaderObservationFilter`
implementation that writes the current Trace Id (if present) to the
`X-Trace-Id` HTTP response header.

This feature is disabled by default, applications will need to enable
`management.observations.http.server.requests.write-trace-header`.
`
Closes gh-40857
2025-02-10 18:08:31 +01:00
Andy Wilkinson f5f888dbdd Polish
See gh-44197
2025-02-10 15:28:05 +00:00
Andy Wilkinson 62b217e0da Apply mgmt access log prefix to reactive Jetty, Tomcat, and Undertow
Fixes gh-44197
2025-02-10 14:53:35 +00:00
Andy Wilkinson 436b51c065 Upgrade to Neo4j Java Driver 5.28.1
Closes gh-44198
2025-02-10 12:54:54 +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 3137f20b4a Merge branch '3.4.x'
Closes gh-44194
2025-02-10 11:09:38 +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 ceaffaab4e Merge branch '3.4.x'
Closes gh-44192
2025-02-10 10:28:08 +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 c86ac9ecaf Merge branch '3.4.x'
Closes gh-44191
2025-02-10 09:37:21 +00:00
Andy Wilkinson 1c0253b380 Align reactive EndpointRequest with servlet equivalent
Closes gh-44189
2025-02-10 09:28:28 +00:00
Andy Wilkinson 4212ee7298 Merge branch '3.4.x'
Closes gh-44190
2025-02-10 09:27:01 +00:00
Andy Wilkinson 3603cb4ad9 Fix matching against context with implicit server namespace
Closes gh-44188
2025-02-10 09:18:46 +00:00
Johnny Lim 8c35bce668 Polish
See gh-44184

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-10 07:32:14 +01:00
Stéphane Nicoll d9fc813fb5 Upgrade to Native Build Tools Plugin 0.10.5
Closes gh-44183
2025-02-08 16:04:17 +01: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 e40a7686cd Merge branch '3.4.x'
Closes gh-44171
2025-02-08 10:08:57 +00: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
Andy Wilkinson d4d041113c Start building against Spring Session 3.4.2 snapshots
See gh-44167
2025-02-08 10:04:27 +00:00
Andy Wilkinson 7bf9725b82 Start building against Spring Security 6.5.0-M2 snapshots
See gh-44166
2025-02-08 10:04:27 +00:00
Andy Wilkinson 4f445640a6 Start building against Spring Pulsar 1.2.3 snapshots
See gh-44165
2025-02-08 10:04:27 +00:00
Andy Wilkinson 34fac24b33 Start building against Spring LDAP 3.3.0-M2 snapshots
See gh-44164
2025-02-08 10:04:27 +00:00
Andy Wilkinson 00fb6613d3 Start building against Spring Kafka 3.3.3 snapshots
See gh-44163
2025-02-08 10:04:26 +00:00
Andy Wilkinson 4c7f314ede Start building against Spring Integration 6.5.0-M2 snapshots
See gh-44162
2025-02-08 10:04:26 +00:00
Andy Wilkinson 20392b0a20 Start building against Spring GraphQL 1.3.4 snapshots
See gh-44161
2025-02-08 10:04:26 +00:00
Andy Wilkinson fd6fd3f7b8 Polish "Upgrade to Elasticsearch Client 8.17.0"
See gh-44100
2025-02-08 10:04:03 +00:00
Dmytro Nosan ed5100ecee Upgrade to Elasticsearch Client 8.17.0
See gh-44100

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-08 10:04:00 +00:00
Andy Wilkinson 0e686ba452 Start building against Spring HATEOAS 2.5.0-M1 snapshots
See gh-44169
2025-02-08 10:01:09 +00:00
Andy Wilkinson 1a3dd82684 Upgrade to Neo4j Java Driver 5.27.0
Closes gh-43684
2025-02-08 10:01:09 +00:00
Andy Wilkinson 822e7de3eb Start building against Spring Data Bom 2025.0.0-M1 snapshots
See gh-44159
2025-02-07 21:01:57 +00:00
Andy Wilkinson 1e58f2bf84 Start building against Spring Authorization Server 1.4.2 snapshots
See gh-44158
2025-02-07 20:44:39 +00:00
Andy Wilkinson 92a8fbb878 Start building against Reactor Bom 2024.0.3 snapshots
See gh-44157
2025-02-07 20:44:35 +00:00
Andy Wilkinson d147881a82 Start building against Micrometer Tracing 1.5.0-M2 snapshots
See gh-44156
2025-02-07 20:44:30 +00:00
Andy Wilkinson 60334f18d4 Start building against Micrometer 1.15.0-M2 snapshots
See gh-44155
2025-02-07 20:44:26 +00:00
Andy Wilkinson 8ce7da9bb0 Avoid duplicate customization of management web server factory
Previously, customization was performed in two places:

1. By customizers defined in the reactive and servlet web servlet
   factory auto-configuration
     - ServletWebServerFactoryAutoConfiguration
     - ReactiveWebServerFactoryAutoConfiguration
 2. By a ManagementWebServerFactoryCustomizer that delegates to
    customizers of certain types found in the application context
    hierarchy.

This led to some double customization as the customizers registered
by the auto-configuration classes were also found and called by the
ManagementWebServerFactoryCustomizer.

Additionally, the ManagementWebServerFactoryCustomizer would find
customizers from the parent context registered by
EmbeddedWebServerFactoryCustomizerAutoConfiguration.

This commit reworks the customization of the management web server
factory to remove the double customization.
ManagementWebServerFactoryCustomizer no longer delegates to
customizers that it finds in the context hierarchy. This
prevents the customizers defined in the reactive and servlet web
server factory auto-configuration classes from being called twice.
Additionally, EmbeddedWebServerFactoryCustomizerAutoConfiguration is
now registered in the child context so that its customizers continue
to be called when preparing the management context web server
factory.

Closes gh-44151
2025-02-07 12:23:40 +00:00
Johnny Lim c335f772d0 Polish
See gh-44148

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-07 09:21:19 +01:00
Moritz Halbritter 1e73a7cf8b Merge branch '3.4.x' 2025-02-06 15:51:12 +01:00
Moritz Halbritter 4fbbc3eda1 Clean up duplicate JsonView entry 2025-02-06 15:40:05 +01:00
Moritz Halbritter 0eb69445f2 Merge branch '3.4.x' 2025-02-06 14:27:17 +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 129a20132b Merge branch '3.4.x'
Closes gh-44146
2025-02-06 12:24:12 +01:00