Commit Graph

28476 Commits

Author SHA1 Message Date
Stéphane Nicoll 07f8c47b59 Merge branch '3.4.x'
Closes gh-44827
2025-03-21 08:09:10 +01:00
Stéphane Nicoll 3460c0d19f Merge branch '3.3.x' into 3.4.x
Closes gh-44826
2025-03-21 08:09:01 +01:00
Stéphane Nicoll 28f8e3812b Fix code format
See gh-44787
2025-03-21 08:01:06 +01:00
Michael Yan 78b9eca670 Polish javadoc of SpringProfileAction
See gh-44787

Signed-off-by: Michael Yan <rain@rainboyan.com>
2025-03-21 07:59:35 +01:00
Stéphane Nicoll c2e4793b05 Merge branch '3.3.x' into 3.4.x
Closes gh-44823
2025-03-21 07:57:16 +01:00
Michael Yan 45a99f9e5a Remove extra whitespace in logback defaults.xml
See gh-44786

Signed-off-by: Michael Yan <rain@rainboyan.com>
2025-03-21 07:55:14 +01:00
Stéphane Nicoll 03d26e1410 Merge branch '3.4.x'
Closes gh-44822
2025-03-21 07:53:56 +01:00
Stéphane Nicoll ca61652edc Merge branch '3.3.x' into 3.4.x
Closes gh-44821
2025-03-21 07:53:51 +01:00
Stéphane Nicoll 3ea272ac2a Rewrite 2nd level cache to use ehcache
Closes gh-44809
2025-03-21 07:53:48 +01:00
Stéphane Nicoll 515ce3d44d Merge branch '3.4.x'
Closes gh-44820
2025-03-21 07:53:37 +01:00
Stéphane Nicoll c39226b7a7 Merge branch '3.3.x' into 3.4.x
Closes gh-44819
2025-03-21 07:53:32 +01:00
Stéphane Nicoll 9091f3f58f Make link to DataSourceAutoConfiguration explicit
This commit updates DataSourceTransactionManagerAutoConfiguration to
explicitly states it should run after DataSourceAutoConfiguration.

Closes gh-44810
2025-03-21 07:53:30 +01:00
Stéphane Nicoll 1f526d6136 Merge branch '3.4.x'
Closes gh-44818
2025-03-21 07:53:17 +01:00
Stéphane Nicoll 7d409f704c Merge branch '3.3.x' into 3.4.x
Closes gh-44817
2025-03-21 07:53:10 +01:00
Stéphane Nicoll 7733551e0b Stop relying on JPA entities from another module in tests
Closes gh-44804
2025-03-21 07:53:08 +01:00
Brian Clozel acb2465566 Add keep-alive property for GraphQL SSE handlers
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 commit adds a new `spring.graphql.http.sse.keep-alive`
configuration property for MVC and WebFlux SSE handlers.

Closes gh-44743
2025-03-20 17:00:37 +01:00
Andy Wilkinson 95d5e35ff2 Provide @ConditionalOn… annotations for all concrete conditions
Closes gh-41044
2025-03-20 14:29:59 +00:00
Andy Wilkinson 6367074829 Polish "Add support for omitting SameSite attribute from session cookie"
See gh-44714
2025-03-20 12:52:01 +00:00
Filip Hrisafov ccbc4f91ec Add support for omitting SameSite attribute from session cookie
See gh-44714

Signed-off-by: Filip Hrisafov <filip.hrisafov@gmail.com>
2025-03-20 12:44:05 +00:00
Abel Salgado Romero 1ac039dbe5 Update org.cyclonedx.bom version in docs 2.2.0
See gh-44753

Signed-off-by: Abel Salgado Romero <abel.salgado@broadcom.com>
2025-03-20 12:41:33 +00:00
Yanming Zhou 7af7820a64 Auto-configu Batch to use JobsParametersConverter bean when available
See gh-44799

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-20 12:27:14 +00:00
Andy Wilkinson adae2e1946 Polish "Allow to configure validateTransactionState for Spring Batch"
See gh-44803
2025-03-20 12:14:12 +00:00
Yanming Zhou f4a9236e01 Allow to configure validateTransactionState for Spring Batch
See gh-44803

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-20 12:07:57 +00:00
Andy Wilkinson 4a2c26eeec Upgrade to Spring Batch 5.2.2
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-44591
2025-03-19 17:50:26 +00:00
Andy Wilkinson f86a6fb164 Upgrade to Spring Batch 5.2.2
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-44568
2025-03-19 17:48:56 +00:00
Andy Wilkinson b5628295da Upgrade to WebJars Locator Lite 1.1.0
Closes gh-44785
2025-03-19 09:29:59 +00:00
Andy Wilkinson 2b503650cf Upgrade to Spring WS 4.1.0-M1
Closes gh-44599
2025-03-19 09:29:59 +00:00
Andy Wilkinson fbd5dab421 Upgrade to Spring Security 6.5.0-M3
Closes gh-44598
2025-03-19 09:29:59 +00:00
Andy Wilkinson 9f3549a74c Upgrade to Spring Kafka 3.3.4
Closes gh-44595
2025-03-19 09:29:58 +00:00
Andy Wilkinson c10eea278f Upgrade to Spring Integration 6.5.0-M3
Closes gh-44594
2025-03-19 09:29:58 +00:00
Andy Wilkinson da8f3810ab Upgrade to Spring GraphQL 1.4.0-M1
Closes gh-44593
2025-03-19 09:29:58 +00:00
Andy Wilkinson b75fda2309 Upgrade to Spring Authorization Server 1.5.0-M2
Closes gh-44590
2025-03-19 09:29:58 +00:00
Andy Wilkinson c172372dc2 Upgrade to OpenTelemetry 1.48.0
Closes gh-44784
2025-03-19 09:29:58 +00:00
Andy Wilkinson bc79b35019 Upgrade to MSSQL JDBC 12.10.0.jre11
Closes gh-44783
2025-03-19 09:29:58 +00:00
Andy Wilkinson 02f82775a5 Upgrade to Logback 1.5.18
Closes gh-44781
2025-03-19 09:29:57 +00:00
Andy Wilkinson b60194441e Upgrade to JUnit Jupiter 5.12.1
Closes gh-44780
2025-03-19 09:29:57 +00:00
Andy Wilkinson 3d650e4ccf Upgrade to Jetty 12.0.18
Closes gh-44779
2025-03-19 09:29:57 +00:00
Andy Wilkinson 07efdb31f0 Upgrade to Flyway 11.4.0
Closes gh-44778
2025-03-19 09:29:57 +00:00
Andy Wilkinson 8dc58f06c7 Upgrade to Artemis 2.40.0
Closes gh-44777
2025-03-19 09:29:57 +00:00
Moritz Halbritter cb3874fdbe Merge branch '3.4.x' 2025-03-19 09:51:02 +01:00
Moritz Halbritter 6567609cbc 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
2025-03-19 09:49:43 +01:00
Moritz Halbritter 80b6c59669 Improve debuggability of DockerComposeTestExtension
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
2025-03-19 09:42:22 +01:00
Moritz Halbritter 6b9cd873ca Use gvenzl/oracle-free:23.6-slim which has ARM64 support
See gh-35249
2025-03-19 09:22:58 +01:00
Andy Wilkinson a4a88d910c Upgrade to Spring WS 4.0.12
Closes gh-44573
2025-03-19 08:08:15 +00:00
Andy Wilkinson 089ce80b81 Upgrade to Spring Security 6.4.4
Closes gh-44572
2025-03-19 08:08:15 +00:00
Andy Wilkinson 6dc824a963 Upgrade to Spring Kafka 3.3.4
Closes gh-44570
2025-03-19 08:08:14 +00:00
Andy Wilkinson bd70c5deef Upgrade to Spring Integration 6.4.3
Closes gh-44776
2025-03-19 08:08:14 +00:00
Andy Wilkinson f6bd6dcf8e Upgrade to Logback 1.5.18
Closes gh-44775
2025-03-19 08:08:14 +00:00
Andy Wilkinson 2f68799c58 Upgrade to Jetty 12.0.18
Closes gh-44774
2025-03-19 08:08:14 +00:00
Andy Wilkinson 7970c26888 Upgrade to Jetty Reactive HTTPClient 4.0.9
Closes gh-44773
2025-03-19 07:59:14 +00:00