Commit Graph
58523 Commits
Author SHA1 Message Date
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
Andy Wilkinson edd530c7e1 Merge branch '3.5.x'
Closes gh-48095
2025-11-12 14:56:19 +00:00
Andy Wilkinson adbeb7a03d Include in the appendix properties described using only manual metadata
Closes gh-48073
2025-11-12 14:55:06 +00:00
Stéphane Nicoll 4dd933738c Upgrade to Tomcat 11.0.14
Closes gh-48094
2025-11-12 15:51:03 +01:00
Stéphane Nicoll 0cb87dd047 Upgrade to Prometheus Client 1.4.3
Closes gh-48093
2025-11-12 15:51:03 +01:00
Stéphane Nicoll 5dffa3da4e Upgrade to MySQL 9.5.0
Closes gh-48092
2025-11-12 15:51:03 +01:00
Stéphane Nicoll 9aea720fd8 Upgrade to Logback 1.5.21
Closes gh-48091
2025-11-12 15:51:03 +01:00
Stéphane Nicoll 24cc3e490f Upgrade to jOOQ 3.19.28
Closes gh-48090
2025-11-12 15:51:03 +01:00
Stéphane Nicoll d530c2c104 Upgrade to Jackson Bom 3.0.2
Closes gh-48089
2025-11-12 15:51:03 +01:00
Stéphane Nicoll 978959658b Upgrade to Hibernate 7.1.7.Final
Closes gh-48088
2025-11-12 15:51:03 +01:00
Stéphane Nicoll c7bc4ff263 Upgrade to DB2 JDBC 12.1.3.0
Closes gh-48087
2025-11-12 15:51:03 +01:00
Andy Wilkinson 8e71f9b77a Merge branch '3.5.x'
Closes gh-48082
2025-11-12 14:29:26 +00:00
Andy Wilkinson 0458fa73e1 Merge branch '3.4.x' into 3.5.x
Closes gh-48081
2025-11-12 14:28:58 +00:00
Andy Wilkinson b6d9c48cbd Upgrade to antora-ui-spring 0.4.20
Closes gh-48077
2025-11-12 14:28:49 +00:00
Stéphane Nicoll 0be793ad11 Merge branch '3.5.x' 2025-11-12 15:27:56 +01:00
Stéphane Nicoll f84b1811f2 Merge branch '3.4.x' into 3.5.x 2025-11-12 15:27:50 +01:00
Stéphane Nicoll 4c0edafb0d Upgrade to Tomcat 10.1.49
Closes gh-48086
2025-11-12 15:15:04 +01:00
Stéphane Nicoll a0962920ba Upgrade to Logback 1.5.21
Closes gh-48085
2025-11-12 15:14:59 +01:00
Stéphane Nicoll 43cc205430 Upgrade to jOOQ 3.19.28
Closes gh-48084
2025-11-12 15:14:55 +01:00
Stéphane Nicoll 3ffdf4cb0d Upgrade to DB2 JDBC 12.1.3.0
Closes gh-48083
2025-11-12 15:14:51 +01:00
Stéphane Nicoll 2993a6c3ff Upgrade to Tomcat 10.1.49
Closes gh-48080
2025-11-12 15:14:06 +01:00
Stéphane Nicoll 7c36b7f01d Upgrade to Logback 1.5.21
Closes gh-48079
2025-11-12 15:14:02 +01:00
Stéphane Nicoll df21e2e24d Upgrade to jOOQ 3.19.28
Closes gh-48078
2025-11-12 15:13:58 +01:00
Stéphane Nicoll 481e92dc4b Merge branch '3.5.x'
Closes gh-48075
2025-11-12 13:39:47 +01:00
Stéphane Nicoll f64e84e8c7 Prevent upgrade to Cassandra Driver 4.19.1
Closes gh-48074
2025-11-12 13:37:09 +01:00
Stéphane Nicoll 3e0eb7d930 Merge branch '3.5.x' 2025-11-12 13:21:12 +01:00
Stéphane Nicoll c7c09588c1 Adapt assertion to relax newlines check
See gh-47984
2025-11-12 13:20:51 +01:00
Stéphane Nicoll 73087f369b Merge branch '3.5.x'
Closes gh-48071
2025-11-12 13:08:31 +01:00
Stéphane Nicoll 52951ed8f4 Apply checks for manual configuration metadata
This commit adds a 'org.springframework.boot.configuration-metadata'
plugin to be used for projects that only define manual metadata. Such
project do not need the annotation processor, but do not to check that
the structure of the metadata content matches the same rules.

Closes gh-47984
2025-11-12 13:01:56 +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 fc66e12bd7 Merge branch '3.5.x'
Closes gh-48066
2025-11-11 19:01:18 +00:00
Andy Wilkinson bd2a8acc21 Merge branch '3.4.x' into 3.5.x
Closes gh-48065
2025-11-11 18:59:13 +00:00
Andy Wilkinson d697fc0b35 Upgrade to Antora UI Spring v0.4.19
Closes gh-48064
2025-11-11 18:57:12 +00:00
Andy Wilkinson 152c09d850 Merge branch '3.5.x'
Closes gh-48063
2025-11-11 18:46:59 +00:00
Andy Wilkinson bab7307606 Merge branch '3.4.x' into 3.5.x
Closes gh-48062
2025-11-11 18:44:52 +00:00
Andy Wilkinson 5aeaa74508 Document how soon-to-expire SSL certs are reported
Closes gh-45564
2025-11-11 18:44:21 +00:00
Andy Wilkinson d844840ea2 Merge branch '3.5.x' 2025-11-11 17:02:42 +00:00
Andy Wilkinson f1b26e9402 Merge branch '3.4.x' into 3.5.x
Closes gh-48061
2025-11-11 17:02:30 +00:00
Andy Wilkinson a21bfc2ff5 Delay ServletContext destruction until Undertow is destroyed
Previously, all destruction was done in the stop method including
closing any Closeables registered with the server. One of these
Closeables managed the lifecycle of the DeploymentManager for the
servlet deployment. Closing it made the servlet context unusable
in `@PreDestroy` methods and upon restart.

This commit moves the closing of the registered Closeables into
destroy(). This allows `@PreDestory` methods to use the
ServletContext. It also allows the server to be stopped and then
restarted without making the ServletContext unusable as it's left
running while the server itself is stopped and not accepting
requests.

Fixes gh-47141
2025-11-11 17:00:48 +00: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 c7c0d33b86 Revert "Merge branch '3.4.x' into 3.5.x"
This reverts commit 4089156b3c, reversing
changes made to 049c6d50d5.

See gh-48058
2025-11-11 16:37:27 +00:00
Andy Wilkinson 8249929b68 Revert "Stop throwing PortInUseException for unassignable address"
This reverts commit 5229ac7e58.

The change works on macOS but not on Linux.

See gh-47618
2025-11-11 16:35:24 +00:00
Andy Wilkinson 001f953cc9 Merge branch '3.5.x'
Closes gh-48059
2025-11-11 16:11:27 +00:00
Andy Wilkinson 4089156b3c Merge branch '3.4.x' into 3.5.x
Closes gh-48058
2025-11-11 16:09:14 +00:00
Andy Wilkinson 5229ac7e58 Stop throwing PortInUseException for unassignable address
Previously, an unassignable address would result in NettyWebServer
incorrectly throwing a PortInUseException.

Fixes gh-47618
2025-11-11 16:07:35 +00:00
Andy Wilkinson 0ae86935ae Merge branch '3.5.x'
Closes gh-48057
2025-11-11 15:29:33 +00:00