Commit Graph

58713 Commits

Author SHA1 Message Date
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
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
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'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:25], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:25], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-48071
2025-11-12 13:08:31 +01:00
Stéphane Nicoll 52951ed8f4 Apply checks for manual configuration metadata
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:25], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:25], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
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
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:25], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:25], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
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] 69eff83577
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'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:25], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:25], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-48066
2025-11-11 19:01:18 +00:00
Andy Wilkinson bd2a8acc21 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:25], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:25], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-48065
2025-11-11 18:59:13 +00:00
Andy Wilkinson d697fc0b35 Upgrade to Antora UI Spring v0.4.19
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
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
Andy Wilkinson 049c6d50d5 Merge branch '3.4.x' into 3.5.x
Closes gh-48056
2025-11-11 15:22:52 +00:00
Andy Wilkinson d08ac5ce4a Allow cache removals to be registered as a function counter
Fixes gh-46212
2025-11-11 15:21:40 +00:00
Andy Wilkinson 756a6408fe Merge branch '3.5.x'
Closes gh-48055
2025-11-11 14:25:35 +00:00
Andy Wilkinson 5c711e2a88 Merge branch '3.4.x' into 3.5.x
Closes gh-48054
2025-11-11 14:04:54 +00:00
Andy Wilkinson 06fd384e59 Include WebSecurityCustomizer components in WebMvcTest
This commit also tests that WebSecurityConfigurer components are
included. They include was already there but the functionality was
untested.

Fixes gh-47255
2025-11-11 14:03:25 +00:00
Moritz Halbritter 93b14bf07e Upgrade to Native Build Tools Plugin 0.11.3
Closes gh-48051
2025-11-11 14:36:50 +01:00
Moritz Halbritter 72740e0f48 Merge branch '3.5.x'
Closes gh-48053
2025-11-11 14:29:39 +01:00
Moritz Halbritter f69fbdb5f5 Merge branch '3.4.x' into 3.5.x
Closes gh-48052
2025-11-11 14:15:57 +01:00
Moritz Halbritter e58c8975f6 Document how to use ContextPropagatingTaskDecorator for propagating trace context over thread boundaries
Closes gh-47893
2025-11-11 12:51:11 +01:00
Moritz Halbritter 3c64bdf118 Document that you need to build with Java 25 for buildpack build-image Graal support
Closes gh-45501
2025-11-11 12:00:19 +01:00