Commit Graph
671 Commits
Author SHA1 Message Date
Phillip Webb 2a9e6a2b93 Merge branch '3.5.x'
Fixes gh-48059
2025-11-17 11:39:19 -08:00
Stéphane Nicoll 971bd500d4 Polish "Add missing HttpClientSettingsPropertyMapper tests"
See gh-48145
2025-11-17 09:53:41 +01:00
Steve Armstrong 82fe577596 Add missing HttpClientSettingsPropertyMapper tests
See gh-48145

Signed-off-by: Steve Armstrong <stevearmstrong-dev@users.noreply.github.com>
2025-11-17 09:44:12 +01:00
Stéphane Nicoll 2e4566bd3d Polish 2025-11-17 09:42:06 +01:00
Stéphane Nicoll bc25b58c6f Remove outdated exclusions to commons-logging
Closes gh-48142
2025-11-15 10:53:09 +01:00
Stefan Würsten 9ccec12506 Move mime-mappings.properties to spring-boot-web-server
This commit moves mime-mapping.properties in the module that actually
uses it, rather than in the top-level spring-boot module.

See gh-48138

Signed-off-by: Stefan Würsten <stefan@wuersten.ch>
2025-11-14 14:52:54 +01:00
Andy Wilkinson 781035b409 Remove import of deleted auto-configuration class
See gh-47848
2025-11-14 11:14:36 +00:00
Andy Wilkinson e6f6ee78da Move ReactiveElasticsearchClient auto-config to correct module
Closes gh-47848
2025-11-14 09:39:46 +00:00
Andy Wilkinson b65fe6520a Merge branch '3.5.x'
Closes gh-48134
2025-11-14 08:57:57 +00:00
Andy Wilkinson 083a0a68af Polish "Add since to deprecations in config metadata JSON files"
This restores properties that were accidentally removed in the
changes for gh-48122.
2025-11-13 15:17:29 +00:00
Stéphane Nicoll a4ff1e51da Polish "Add since to deprecations in config metadata JSON files"
See gh-47972
See gh-47980
2025-11-13 15:45:46 +01:00
Stéphane Nicoll 3d23261f87 Merge branch '3.5.x'
Closes gh-48122
2025-11-13 14:55:19 +01:00
Andy Wilkinson bb0437c0e1 Correct names of isolated Json/ObjectMapper properties
Closes gh-48116
2025-11-13 12:00:19 +00:00
Andy Wilkinson 9cc18130e6 Merge branch '3.5.x'
Closes gh-48110
2025-11-13 10:19:47 +00:00
Stéphane Nicoll d1e5fe3248 Merge branch '3.5.x'
Closes gh-48106
2025-11-13 10:31:25 +01:00
Brian Clozel d161aafcdf Restrict Kotlin serialization when alternative is available
This commit applies similar changes already contributed to the
`HttpMessageConverter` stack for MVC applications.
Since there was no auto-configuration for Kotlinx JSON Serialization on
the reactive side, this commit adds a relevant `CodecCustomizer` that
will use an available `Json` bean and use it to configure a codec that:

* will only consider `@Serializable`-annotated types if another JSON
  library is available
* will use a broader support with Kotlinx Serialization otherwise

Fixes gh-48070
2025-11-12 21:09:39 +01:00
Andy Wilkinson eb381d642a Provide default values for Kotlinx Serialization JSON properties
Closes gh-48097
2025-11-12 19:50:20 +00:00
Andy Wilkinson 5699915383 Rename module for Kotlinx Serialization JSON support
Closes gh-48076
2025-11-12 17:34:28 +00:00
Brian Clozel 44f0c772a2 Configure JSON and XML converters on HttpMessageConverters
This commit ensures that XML and JSON converters on both client and
server are configured using the dedicated methods on
`HttpMessageConverters`, instead of pushing them ahead of default
converters.

Closes gh-47917
Fixes gh-48096
2025-11-12 16:15:13 +01:00
Stéphane Nicoll 73087f369b Merge branch '3.5.x'
Closes gh-48071
2025-11-12 13:08:31 +01:00
Andy Wilkinson 4096b736c8 Tolerate race condition in httpRequestsAreTimed
Tomcat 11 will [1] send a response as soon as Content-Length bytes has
been written. This initiates a race between the timer being registered
on the server side and the test receiving the response and looking for
the timer.

Rather than sleeping for a fix period of time, we now use Awaitility
to await the availability of the timer.

Closes gh-48049

[1] https://github.com/apache/tomcat/commit/69eff83577f7c00cbaaca9384ab4b1989f516797
2025-11-12 11:40:30 +00:00
Andy Wilkinson 58cdf71b52 Restrict Kotlin serialization when alternative is available
Previously, Kotlin Serialization would be used too aggressively then
an alternative JSON converter was available. This could lead to
unwanted results when a response should have been serialized using
Jackson, for example, rather than Kotlin Serialization.

This commit addresses this by only allowing Kotlin Serialization to
serialize types that are not annotated with @Serializable when no
alternative JSON converter is available.

Fixes gh-48070
2025-11-12 10:00:45 +00:00
Brian Clozel 2e52c3c35e Update Kotlin Serialization configuration in HttpMessageConverters
As of As of spring-projects/spring-framework#35733, Spring Framework has
a dedicated method for configuring a Kotlin Serialization converter
specifically.

This commit uses this method instead of configuring the Kotlin
Serialization JSON support as a custom converter. This also removes the
`@Order` on the Kotlin converter bean itself, as there is no need to
order it in the list of custom converters anymore.

Closes gh-47917
2025-11-12 09:48:55 +01:00
Andy Wilkinson 93a3511f8a Revert "Merge branch '3.5.x'"
This reverts commit 001f953cc9, reversing
changes made to 0ae86935ae.

See gh-48059
2025-11-11 16:38:33 +00:00
Andy Wilkinson 001f953cc9 Merge branch '3.5.x'
Closes gh-48059
2025-11-11 16:11:27 +00:00
Andy Wilkinson 0ae86935ae Merge branch '3.5.x'
Closes gh-48057
2025-11-11 15:29:33 +00:00
Andy Wilkinson 756a6408fe Merge branch '3.5.x'
Closes gh-48055
2025-11-11 14:25:35 +00:00
Andy Wilkinson bbfd9f892b Revert "Remove sleep that appears to no longer be needed"
This reverts commit 6e8481bfff.

See gh-48049
2025-11-11 10:22:08 +00:00
Stéphane Nicoll 8584f604e3 Rename maxAttempts to maxRetries
Closes gh-48023
2025-11-11 10:22:08 +00:00
Stéphane Nicoll 00f60da0de Start building against Spring Framework 7.0.0 snapshots
See gh-47825
2025-11-11 10:22:06 +00:00
Stéphane Nicoll bb9d3ecdfb Merge branch '3.5.x' 2025-11-10 15:52:23 +01:00
Andy Wilkinson 0e44f1de42 Merge branch '3.5.x' 2025-11-10 10:39:32 +00:00
Stéphane Nicoll 96457f4665 Merge branch '3.5.x'
Closes gh-47996
2025-11-09 12:16:47 +01:00
Andy Wilkinson 07b13a40b1 Use separate Jakarta Mail API and Angus Mail dependencies
Closes gh-47983
2025-11-07 14:34:10 +00:00
Moritz Halbritter d85a8017f0 Fix duplicate dependency in spring-boot-r2dbc 2025-11-06 11:32:59 +01:00
Moritz Halbritter fbccc8011e Add missing deprecation for 'management.tracing.enabled' property 2025-11-06 09:53:08 +01:00
Moritz Halbritter ab405a3321 Add missing configuration metadata deprecations and replacements 2025-11-06 09:11:41 +01:00
Andy Wilkinson 6e8481bfff Remove sleep that appears to no longer be needed
Closes gh-45404
2025-11-06 08:08:51 +00:00
Phillip WebbandAndy Wilkinson 619454548b Restore support for Jersey
Restore support for Jersey now that it supports JAX-RS 4.

Closes gh-47967

Co-authored-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2025-11-05 10:51:08 -08:00
Moritz Halbritter ff4889217c Fix configuration metadata 2025-11-05 15:13:01 +01:00
Moritz Halbritter 2421f02b85 Extract OpenTelemetryLoggingAutoConfiguration
This auto-configuration configures OpenTelemetry logging. The existing
OpenTelemetrySdkAutoConfiguration now only configures the OpenTelemetry
SDK, but no individual subsystems (logging, metrics, tracing).

Closes gh-47963
2025-11-05 14:57:33 +01:00
Moritz Halbritter da8aedb193 Restore management.logging.export.enabled in documentation
Closes gh-47961
2025-11-05 14:21:37 +01:00
Moritz Halbritter c872557906 Rename management.zipkin.tracing
It's now 'management.tracing.export.zipkin'

Closes gh-47958
2025-11-05 13:52:25 +01:00
Moritz Halbritter 4866f1a395 Switch property backing OnEnabledTracingExportCondition
It's now management.tracing.export.{name}.enabled

Closes gh-47959
2025-11-05 13:52:25 +01:00
Moritz Halbritter fd7f5c5abc Rename TestImage.OPENTELEMETRY to OTEL_COLLECTOR
Closes gh-47956
2025-11-05 12:19:29 +01:00
Moritz Halbritter 7e5897066c Rename management.opentelemetry.logging.export properties
They are now under 'management.opentelemetry.logging.export.otlp.*'.

Closes gh-47954
2025-11-05 12:14:14 +01:00
Moritz Halbritter 93381c7e8e Switch property backing OnEnabledLoggingExportCondition
It's now 'management.logging.export.{name}.enabled'.

Closes gh-47957
2025-11-05 12:14:14 +01:00
Moritz Halbritter 89204348f5 Rename OpenTelemetry Logging auto-configuration
It's dealing with OTLP, so the name should reflect that.
It now also mirrors the structure from micrometer-tracing-opentelemetry.

See gh-47954
2025-11-05 12:14:14 +01:00
Moritz Halbritter e9172d9f51 Split spring-boot-micrometer-tracing into Brave and OpenTelemetry specific module
Closes gh-47953
2025-11-05 12:14:13 +01:00
Filip Hrisafov 163cc8e05a Use elasticsearch-rest5-client in spring-boot-elasticsearch
See gh-47945

Signed-off-by: Filip Hrisafov <filip.hrisafov@gmail.com>
2025-11-05 09:43:47 +00:00