Commit Graph

29108 Commits

Author SHA1 Message Date
Phillip Webb dde1ab4aa8 Fix spring-data relational imports
See gh-45488
2025-05-09 17:38:10 -07: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 0510cfa684 Refine '?' use in Kotlin code 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 5ce080f1bb Upgrade to Kafka 4.0.0
Closes gh-45485
2025-05-09 17:38:10 -07:00
Stéphane Nicoll 4b74619f47 Upgrade to Jakarta Annotation 3.0.0
Closes gh-45484
2025-05-09 17:38:10 -07:00
Stéphane Nicoll f1629ceba3 Upgrade to Jersey 4.0.0-M2
Closes gh-45483
2025-05-09 17:38:10 -07:00
Stéphane Nicoll e7588ac300 Upgrade to Jakarta WebSocket 2.2.0
Closes gh-45482
2025-05-09 17:38:10 -07:00
Stéphane Nicoll 9f02875d90 Upgrade to Hibernate Validator 9.0.0.CR1
Closes gh-45481
2025-05-09 17:38:09 -07:00
Stéphane Nicoll c928bd5841 Upgrade to Jakarta Validation 3.1.0
Closes gh-45480
2025-05-09 17:38:09 -07:00
Stéphane Nicoll 5d0c325b4c Upgrade to Jakarta Servlet 6.1.0
Closes gh-45479
2025-05-09 17:38:09 -07:00
Stéphane Nicoll eb1cecdc94 Upgrade to Jakarta WS RS 4.0.0
Closes gh-45478
2025-05-09 17:38:09 -07:00
Stéphane Nicoll 3881a79383 Upgrade to Hibernate 7.0.0.Beta3 and Jakarta Persistence 3.2.0
Closes gh-45476
Closes gh-45477
2025-05-09 17:38:09 -07:00
Stéphane Nicoll baefbc1aff Upgrade to Tomcat 11.0.6
Closes gh-45475
2025-05-09 17:38:09 -07:00
Phillip Webb fd061220a7 Upgrade to ArchUnit 1.4
Closes gh-45474
2025-05-09 17:38:09 -07:00
Andy Wilkinson 6e2049eb92 Compile project with Java 24 and '-release' Java 17
Closes gh-45472
2025-05-09 17:38:08 -07:00
Andy Wilkinson af220127d0 Prepare 4.0.x branch 2025-05-09 17:38:08 -07:00
Tran Ngoc Nhan 1f24feafbd Fix typo
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
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-05-09 17:37:30 -07:00
Phillip Webb 4f60b8a968 Merge branch '3.4.x'
Closes gh-45500
2025-05-09 17:37:24 -07:00
Phillip Webb 0eddab6d3c Merge branch '3.3.x' into 3.4.x
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
Closes gh-45499
2025-05-09 17:37:19 -07:00
Tran Ngoc Nhan 8dcf969005 Fix typos
See gh-45411

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-05-09 17:34:37 -07:00
Phillip Webb c8b1e8ee27 Upgrade to Elasticsearch 8.18.1
See gh-45447
2025-05-09 14:19:08 -07:00
Andy Wilkinson 058eabf317 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
Closes gh-45471
2025-05-09 14:31:15 +01:00
Andy Wilkinson 99ecfb86b5 Merge branch '3.3.x' into 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
Closes gh-45470
2025-05-09 14:31:06 +01:00
Andy Wilkinson fe6f0a5905 Stop leaking a cache in Cache2kCacheMeterBinderProviderTests
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: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-45469
2025-05-09 14:30:28 +01:00
Stéphane Nicoll 36d3bbff3d Upgrade to R2DBC Proxy 1.1.6.RELEASE
Closes gh-45467
2025-05-09 13:39:24 +02:00
Stéphane Nicoll 12ee71dcdf Upgrade to Netty 4.1.121.Final
Closes gh-45466
2025-05-09 13:39:20 +02:00
Stéphane Nicoll 80c353b3c4 Upgrade to jOOQ 3.19.23
Closes gh-45465
2025-05-09 13:39:16 +02:00
Stéphane Nicoll c66eebc527 Upgrade to Jetty 12.0.20
Closes gh-45464
2025-05-09 13:39:12 +02:00
Stéphane Nicoll e6be4765de Upgrade to HttpClient5 5.4.4
Closes gh-45462
2025-05-09 13:39:05 +02:00
Stéphane Nicoll 7de00e16cd Switch to same-minor-version upgrade policy for post-RC phase
Closes gh-45461
2025-05-09 13:37:42 +02:00
Stéphane Nicoll ddddad7607 Upgrade to R2DBC Proxy 1.1.6.RELEASE
Closes gh-45460
2025-05-09 13:05:37 +02:00
Stéphane Nicoll cb3d3a2549 Upgrade to Netty 4.1.121.Final
Closes gh-45459
2025-05-09 13:05:33 +02:00
Stéphane Nicoll ae74a8d887 Upgrade to jOOQ 3.19.23
Closes gh-45458
2025-05-09 13:05:29 +02:00
Stéphane Nicoll 1dc605cd31 Upgrade to Jetty 12.0.20
Closes gh-45457
2025-05-09 13:05:25 +02:00
Stéphane Nicoll c6330c8c85 Upgrade to HttpClient5 5.4.4
Closes gh-45455
2025-05-09 13:05:17 +02:00
Stéphane Nicoll 421be5e0e6 Upgrade to R2DBC Proxy 1.1.6.RELEASE
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: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-45454
2025-05-09 13:05:01 +02:00
Stéphane Nicoll fd68325566 Upgrade to Netty 4.1.121.Final
Closes gh-45453
2025-05-09 13:04:57 +02:00
Stéphane Nicoll 6c223e4a60 Upgrade to jOOQ 3.19.23
Closes gh-45452
2025-05-09 13:04:53 +02:00
Stéphane Nicoll b41296f8c7 Upgrade to Jetty 12.0.20
Closes gh-45451
2025-05-09 13:04:49 +02:00
Stéphane Nicoll ff1f90eed8 Upgrade to Neo4j Java Driver 5.28.5
Closes gh-45446
2025-05-09 12:27:48 +02:00
Stéphane Nicoll 2eef86fc28 Upgrade to Elasticsearch 8.18.0
Closes gh-45447
2025-05-09 12:26:57 +02:00
Stéphane Nicoll 133312a4ae Start building against Spring Data Bom 2025.0.0 snapshots
See gh-45436
2025-05-09 12:26:57 +02:00
Stéphane Nicoll 81d35101da Start building against Spring WS 4.1.0 snapshots
See gh-45445
2025-05-09 12:25:39 +02:00
Stéphane Nicoll ca9c67f749 Start building against Spring Security 6.5.0 snapshots
See gh-45444
2025-05-09 12:25:39 +02:00
Stéphane Nicoll 6cfca354fd Start building against Spring Retry 2.0.12 snapshots
See gh-45443
2025-05-09 12:25:39 +02:00
Stéphane Nicoll 221d5145ef Start building against Spring Pulsar 1.2.6 snapshots
See gh-45442
2025-05-09 12:25:39 +02:00
Stéphane Nicoll ad45bf3c2b Start building against Spring LDAP 3.3.0 snapshots
See gh-45441
2025-05-09 12:25:39 +02:00
Stéphane Nicoll cbb009bbdb Start building against Spring Kafka 3.3.6 snapshots
See gh-45440
2025-05-09 12:25:39 +02:00
Stéphane Nicoll b5d37e2c53 Start building against Spring Integration 6.5.0 snapshots
See gh-45439
2025-05-09 12:25:38 +02:00