Commit Graph

619 Commits

Author SHA1 Message Date
Sébastien Deleuze a48e5baf2f Upgrade to Kotlin 2.2.0
This commit leverages Kotlin 2.2 which is expected to be the
new baseline for Spring Boot 4.0, so API and language
versions are upgraded to KOTLIN_2_2 as well.

It also enables the -Xannotation-default-target=param-property
compiler flag, mainly for test purpose, in order to avoid the
related warnings and to use what will likely be the default in
an upcoming Kotlin version short term. For more details see
https://youtrack.jetbrains.com/issue/KT-73255.

KotlinPlatformJvmPlugin was a class from an old KMP plugin,
deprecated for a long time and now removed. So its usage in
PluginClasspathGradleBuild has been removed as well.

Signed-off-by: Sébastien Deleuze <sdeleuze@users.noreply.github.com>

See gh-46238
2025-07-02 13:10:32 +01:00
Andy Wilkinson ddf3984569 Upgrade to JUnit Jupiter 5.13.1
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: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:false version:24], 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 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-46058
2025-06-24 20:09:19 +01:00
Phillip Webb 6b429a09ca Merge branch '3.5.x'
Closes gh-46070
2025-06-20 17:10:37 -07:00
Phillip Webb 923f7d0ce1 Merge branch '3.4.x' into 3.5.x
Closes gh-46069
2025-06-20 17:10:18 -07:00
Phillip Webb 72b78f7b47 Upgrade to spring-javaformat 0.0.47
Closes gh-46068
2025-06-20 17:06:30 -07:00
Stéphane Nicoll 710f00ff39 Prepare regular dependency upgrades
This commit syncs dependencies from 3.5.x and restores the use of the
"type: dependency-upgrade" label.

Closes gh-46045
2025-06-20 10:38:40 +02:00
Andy Wilkinson d558c6adfa Prepare the 3.5.x branch 2025-06-20 09:19:23 +01:00
Phillip Webb 9bf9442ec9 Next development version (v3.5.4-SNAPSHOT) 2025-06-19 22:31:48 -07:00
Phillip Webb 01a23c3d20 Next development version (v3.5.3-SNAPSHOT) 2025-06-19 11:41:29 -07:00
Andy Wilkinson 440ea79df1 Next development version (v3.5.2-SNAPSHOT) 2025-06-19 15:48:21 +01:00
Stéphane Nicoll 05906cc047 Next development version (v3.4.8-SNAPSHOT)
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 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
2025-06-19 13:00:17 +02:00
Andy Wilkinson 00b5970666 Polish 6de3c1ce9d 2025-06-18 10:15:25 +01:00
Stéphane Nicoll dfb5e227df Upgrade to Jackson Bom 2.19.1
Closes gh-45982
2025-06-17 11:09:47 +02:00
Stéphane Nicoll 250c76ebbc Upgrade to Jackson Bom 2.18.4.1
Closes gh-45957
2025-06-13 16:48:14 +02:00
Stéphane Nicoll 6d9932d973 Upgrade to Spring Framework 6.2.8
Closes gh-45781
2025-06-12 21:32:35 +02:00
Stéphane Nicoll 59e9d25232 Upgrade to Spring Framework 6.2.8
Closes gh-45755
2025-06-12 21:32:30 +02:00
Andy Wilkinson bd19e25cfe Upgrade to Maven 3.9.10
Closes gh-45930
2025-06-12 14:13:41 +01:00
Andy Wilkinson e0b9b44814 Upgrade to Maven 3.9.10
Closes gh-45902
2025-06-12 14:05:12 +01:00
Stéphane Nicoll 60ce7e06ae Upgrade to Tomcat 10.1.42
Closes gh-45872
2025-06-10 17:24:44 +02:00
Stéphane Nicoll d25068d65a Upgrade to Tomcat 10.1.42
Closes gh-45870
2025-06-10 17:20:30 +02:00
Andy Wilkinson 8ba1e41dbb Start building against Spring Framework 6.2.8 snapshots
See gh-45781
2025-06-04 11:42:06 +01:00
Andy Wilkinson 43298ab73e Start building against Spring Framework 6.2.8 snapshots
See gh-45768
2025-06-04 11:19:57 +01:00
Phillip Webb 685dabce01 Next development version (v3.5.1-SNAPSHOT)
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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], 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:23], map[id:windows-latest name:Windows]) (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
2025-05-22 15:12:31 -07:00
Stéphane Nicoll 68df6f5941 Next development version (v3.4.7-SNAPSHOT)
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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], 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:23], map[id:windows-latest name:Windows]) (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
2025-05-22 14:08:45 +02:00
Stéphane Nicoll 50aa74284d Upgrade to Spring Framework 6.2.7
Closes gh-45417
2025-05-15 18:16:15 +02:00
Stéphane Nicoll a7ea66e9cb Upgrade to Spring Framework 6.2.7
Closes gh-45437
2025-05-15 14:58:07 +02:00
Stéphane Nicoll 0915ecc6ec Upgrade to Jackson Bom 2.19.0
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: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:false version:24], 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
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], 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:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], 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:23], map[id:windows-latest name:Windows]) (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-45542
2025-05-14 12:52:58 +02:00
Stéphane Nicoll e1ff4fbaf9 Upgrade to Jackson Bom 2.19.0
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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], 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:23], map[id:windows-latest name:Windows]) (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-45542
2025-05-14 12:38:43 +02:00
Stéphane Nicoll 1dfa5c721c Upgrade to Tomcat 11.0.7
Closes gh-45533
2025-05-13 15:58:00 +02:00
Stéphane Nicoll e9ff0c6074 Upgrade to Tomcat 10.1.41
Closes gh-45520
2025-05-13 09:37:42 +02:00
Stéphane Nicoll 83494b22ad Upgrade to Tomcat 10.1.41
Closes gh-45517
2025-05-13 09:30:22 +02:00
Stéphane Nicoll dd120b937e Merge branch '3.4.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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], 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:23], map[id:windows-latest name:Windows]) (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
2025-05-11 20:14:11 +02:00
Stéphane Nicoll 8922f23cb2 Reapply "Start building against Spring Framework 6.2.7 snapshots"
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Has been cancelled Details
Build and Deploy Snapshot / Trigger Docs Build (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details
This reverts commit 650ce62193.

See gh-45147
2025-05-11 20:13:06 +02:00
Andy Wilkinson caddef7949 Merge branch '3.4.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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], 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:23], map[id:windows-latest name:Windows]) (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
See gh-45437
2025-05-11 08:59:51 +01:00
Andy Wilkinson 650ce62193 Revert "Start building against Spring Framework 6.2.7 snapshots"
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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], 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:23], map[id:windows-latest name:Windows]) (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 reverts commit 9aa0c2ee8a.

See gh-45417
2025-05-11 08:58:36 +01:00
Stéphane Nicoll 3b2c5e86da Upgrade Spring Projects to latest available Snapshot / Milestones
See gh-45487
See gh-45488
See gh-45489
See gh-45490
See gh-45491
See gh-45492
2025-05-09 17:38:10 -07:00
Stéphane Nicoll 7035c0fa0a Upgrade to Kotlin 2.1.0
This commit upgrades to Kotlin 2.1.0. Two related dependencies have been
updated as well: Kotlin Coroutines to 1.10, and Kotlin Serialization to
1.8.

As of Kotlin 2, it is no longer possible to have a Java type and a
Kotlin type with the same name. As our code samples follow that
unfortunate pattern, this commit makes sure that the Kotlin sample code
does not depend on any of the Java counterpart and configure the kotlin
compilation plugin to ignore Java sources.

The minimum version of Gradle is 7.6.4. It bundles a version of Kotlin
that cannot compile a Kotlin build script when spring-core, compiled
with Kotlin 2.1, is on the classpath. Using Gradle 8.12 to run the DSL
tests avoids the problem.

Closes gh-45486

Co-authored-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2025-05-09 17:38:10 -07:00
Stéphane Nicoll baefbc1aff Upgrade to Tomcat 11.0.6
Closes gh-45475
2025-05-09 17:38:09 -07:00
Andy Wilkinson af220127d0 Prepare 4.0.x branch 2025-05-09 17:38:08 -07:00
Stéphane Nicoll c069823e2e Upgrade to Jackson Bom 2.18.4
Closes gh-45463
2025-05-09 13:39:08 +02:00
Stéphane Nicoll 5ef9c217d2 Upgrade to Jackson Bom 2.18.4
Closes gh-45456
2025-05-09 13:05:21 +02:00
Stéphane Nicoll 691bdb161e Start building against Spring Framework 6.2.7 snapshots
See gh-45437
2025-05-09 12:25:38 +02:00
Stéphane Nicoll 9aa0c2ee8a Start building against Spring Framework 6.2.7 snapshots
See gh-45417
2025-05-09 12:25:25 +02:00
Andy Wilkinson ea00325eb6 Next development version (v3.4.6-SNAPSHOT) 2025-04-24 16:02:32 +01:00
Stéphane Nicoll 26ae1138e7 Upgrade to Spring Framework 6.2.6
Closes gh-45142
2025-04-17 16:45:12 +02:00
Stéphane Nicoll 0724e97b02 Upgrade to Spring Framework 6.2.6
Closes gh-45091
2025-04-17 16:44:43 +02:00
Phillip Webb 376b10adfc Upgrade to JUnit Jupiter 5.12.2
Closes gh-45171
2025-04-11 10:24:12 -07:00
Phillip Webb 6556ff66f5 Start building against Spring Framework 6.2.6 snapshots
See gh-45142
2025-04-10 15:09:40 -07:00
Phillip Webb 1046c4628b Upgrade to Tomcat 10.1.40
Closes gh-45128
2025-04-10 15:09:38 -07:00
Phillip Webb 89f5c3ea1f Upgrade to Mockito 5.17.0
Closes gh-45120
2025-04-10 15:05:46 -07:00
Phillip Webb eea93cf5d8 Start building against Spring Framework 6.2.6 snapshots
See gh-45091
2025-04-10 12:21:45 -07:00
Phillip Webb 8670c6c30f Upgrade to Tomcat 10.1.40
Closes gh-45084
2025-04-10 12:21:44 -07:00
Phillip Webb 931f6a4d24 Next development version (v3.4.5-SNAPSHOT)
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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], 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:23], map[id:windows-latest name:Windows]) (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
2025-03-20 20:41:20 -07:00
Stéphane Nicoll 363c6a97ba Upgrade to Spring Framework 6.2.5
Closes gh-44732
2025-03-20 08:35:56 +01:00
Stéphane Nicoll 375aba6985 Upgrade to Spring Framework 6.2.5
Closes gh-44731
2025-03-20 08:35:45 +01:00
Andy Wilkinson 438f7c1697 Upgrade to Mockito 5.16.1
Closes gh-44782
2025-03-19 09:29:58 +00:00
Andy Wilkinson b60194441e Upgrade to JUnit Jupiter 5.12.1
Closes gh-44780
2025-03-19 09:29:57 +00:00
Stéphane Nicoll 769279bd34 Start building against Spring Framework 6.2.5 snapshots
See gh-44732
2025-03-17 14:12:48 +01:00
Stéphane Nicoll 4bdf898e02 Start building against Spring Framework 6.2.5 snapshots
See gh-44731
2025-03-17 14:12:05 +01:00
Stéphane Nicoll b691d2b89b Upgrade to Spring Framework 6.2.4
Closes gh-44517
2025-03-14 17:06:32 +01:00
Stéphane Nicoll 8a72a33051 Upgrade to Native Build Tools Plugin 0.10.6
Closes gh-44709
2025-03-14 10:49:07 +01:00
Stéphane Nicoll 1d284198bf Upgrade to Spring Framework 6.2.4
Closes gh-44442
2025-03-13 11:09:29 +01:00
Stéphane Nicoll 6f0ed7325e Upgrade to Native Build Tools Plugin 0.10.6
Closes gh-44708
2025-03-13 11:09:29 +01:00
Stéphane Nicoll d212fae443 Upgrade to Tomcat 10.1.39
Closes gh-44673
2025-03-11 17:15:30 +01:00
Stéphane Nicoll 8e7d6ecd88 Upgrade to Tomcat 10.1.39
Closes gh-44666
2025-03-11 16:58:43 +01:00
Stéphane Nicoll 9b3f0472f2 Upgrade to Mockito 5.16.0
Closes gh-44618
2025-03-06 16:11:26 +01:00
Stéphane Nicoll eb3f3479b2 Upgrade to Jackson Bom 2.18.3
Closes gh-44609
2025-03-06 15:35:14 +01:00
Stéphane Nicoll cfeb9bd6b6 Upgrade to Jackson Bom 2.18.3
Closes gh-44549
2025-03-05 12:57:37 +01:00
Stéphane Nicoll 2911d1a22a Start building against Spring Framework 6.2.4 snapshots
See gh-44517
2025-03-04 13:05:20 +01:00
Stéphane Nicoll a9615f9b0d Reapply "Start building against Spring Framework 6.2.4 snapshots"
This reverts commit 4d99e4a69f.
2025-02-27 08:40:59 +01:00
Stéphane Nicoll 4d99e4a69f Revert "Start building against Spring Framework 6.2.4 snapshots"
This reverts commit a5f8642127.
2025-02-26 14:35:04 +01:00
Stéphane Nicoll a5f8642127 Start building against Spring Framework 6.2.4 snapshots
See gh-44442
2025-02-26 13:52:28 +01:00
Moritz Halbritter a42b7826cf Next development version (v3.4.4-SNAPSHOT) 2025-02-20 17:01:02 +01: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 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
Andy Wilkinson 0e4f300ca6 Upgrade to Tomcat 10.1.36
Closes gh-44339
2025-02-18 17:53:53 +00:00
Andy Wilkinson 180eef1557 Upgrade to SnakeYAML 2.4
Closes gh-44338
2025-02-18 17:53:47 +00:00
Andy Wilkinson f0513d7402 Upgrade to Tomcat 10.1.36
Closes gh-44333
2025-02-18 17:44:26 +00:00
Andy Wilkinson e8812ace3b Upgrade to Tomcat 10.1.36
Closes gh-44331
2025-02-18 17:40:33 +00:00
Stéphane Nicoll 641f11da7c Upgrade to Spring Framework 6.2.3
Closes gh-44160
2025-02-13 17:06:21 +01:00
Stéphane Nicoll 15494d7f89 Upgrade to Spring Framework 6.2.3
Closes gh-44120
2025-02-13 17:03:39 +01:00
Stéphane Nicoll 188c9a794a Upgrade to Spring Framework 6.1.17
Closes gh-44107
2025-02-13 16:58:59 +01:00
Stéphane Nicoll 59dfe372ea Start building against Spring Framework 6.2.3 snapshots
See gh-44160
2025-02-12 05:15:34 +01:00
Stéphane Nicoll fb7f307c4b Start building against Spring Framework 6.2.3 snapshots
See gh-44120
2025-02-12 05:14:17 +01:00
Stéphane Nicoll ce04ad3112 Start building against Spring Framework 6.1.17 snapshots
See gh-44107
2025-02-12 04:59:45 +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 ff6168cde7 Upgrade to Native Build Tools Plugin 0.10.5
Closes gh-44179
2025-02-08 15:47:58 +01:00
Stéphane Nicoll a4efcfe195 Revert "Start building against Spring Framework 6.1.17 snapshots"
This reverts commit 7317ec19cb.

See gh-44107
2025-02-05 17:22:09 +01:00
Stéphane Nicoll b46698774d Upgrade to Native Build Tools Plugin 0.10.5
Closes gh-44141
2025-02-05 14:57:50 +01:00
Stéphane Nicoll 7317ec19cb Start building against Spring Framework 6.1.17 snapshots
See gh-44107
2025-02-05 10:05:06 +01:00
Phillip Webb 2e458f0060 Upgrade to Hamcrest 3.0
Closes gh-44080
2025-02-04 12:44:16 -08:00
Phillip Webb aeea09308d Upgrade to Commons Codec 1.18.0
Closes gh-44073
2025-02-04 12:05:50 -08:00
Moritz Halbritter a244a74286 Next development version (v3.4.3-SNAPSHOT) 2025-01-23 14:30:08 +01:00
Andy Wilkinson 34c8353946 Next development version (v3.3.9-SNAPSHOT) 2025-01-23 10:03:05 +00:00
Andy Wilkinson 3b0275e830 Upgrade to AssertJ 3.27.3
Closes gh-43667
2025-01-20 15:05:19 +00:00
Stéphane Nicoll 1ae40605d2 Upgrade to Spring Framework 6.2.2
Closes gh-43762
2025-01-16 14:51:16 +01:00
Stéphane Nicoll e48cfcef3a Upgrade to Spring Framework 6.2.2
Closes gh-43750
2025-01-16 14:48:43 +01:00