Commit Graph

28312 Commits

Author SHA1 Message Date
Dmytro Nosan e62d78ab11 Refine the handling of OpenTelemetry resource attributes
See gh-44494

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-03 09:28:46 +01:00
Brian Clozel 83f678a8b1 Separate transports in GraphQL auto-configurations
This commit revisits the existing GraphQL configuration properties to
better reflect which ones belong to specific transports.
This also relaxes the Web auto-configurations to only require the
`ExecutionGraphQlService` as a bean. The `GraphQlSource` is now an
optional bean dependency.

Closes gh-44495
2025-02-28 18:12:31 +01:00
Moritz Halbritter 8f4e0518f3 Polish "Add support for OTel-specific environment variables"
See gh-44394
2025-02-28 14:52:10 +01:00
Dmytro Nosan bf015bfeb9 Add support for OTel-specific environment variables
This commit introduces the OpenTelementryAttributes class that fetches
OTEL_RESOURCE_ATTRIBUTES and OTEL_SERVICE_NAME environment variables
and merges it with user-defined resource attributes.

Besides that, this commit includes spec-compliant proper handling of
OTEL_RESOURCE_ATTRIBUTES in OtlpMetricsPropertiesConfigAdapter and
OpenTelemetryAutoConfiguration.

See gh-44394

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 14:52:10 +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 b22ad76f21 Polish 2025-02-28 13:10:12 +00:00
Johnny Lim 3bc8727848 Add Javadoc since for new methods in LoggingSystemProperties
See gh-44489

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-28 14:08:17 +01:00
Eddú Meléndez 261ea64e39 Add ServiceConnection support for LLdapContainer (Testcontainers)
See gh-44389

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
2025-02-28 13:54:55 +01:00
Eddú Meléndez 5fac1011d6 Add ServiceConnection support for lldap/lldap (Compose)
See gh-44389

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
2025-02-28 13:54:55 +01:00
Andy Wilkinson f715a3676f Merge branch '3.4.x' 2025-02-28 12:26:04 +00: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
Moritz Halbritter d89b679ecd Merge branch '3.4.x'
Closes gh-44485
2025-02-28 11:50:36 +01: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
Dmytro Nosan b140fd1c4c Update LogbackLoggingSystemTests to use Console.charset() when available
See gh-44477

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 11:44:23 +01:00
Moritz Halbritter f01199341b Merge branch '3.4.x'
Closes gh-44484
2025-02-28 11:28: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 77d8b8e2b0 Merge branch '3.4.x'
Closes gh-44482
2025-02-28 11:10:39 +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 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