Commit Graph

58194 Commits

Author SHA1 Message Date
Phillip Webb 15dd5018e2 Merge branch '3.4.x' into 3.5.x 2025-10-22 16:47:39 -07:00
Phillip Webb b361a1f5e3 Upgrade to Spring Batch 5.2.4
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-47486
2025-10-22 16:40:13 -07:00
Phillip Webb 923892860f Upgrade to ActiveMQ 6.1.8
Closes gh-47766
2025-10-22 16:40:13 -07:00
Phillip Webb caf4e9b417 Merge pull request #46213 from quaff
* pr/46213:
  Polish 'Introduce a shared abstraction for database initialization'
  Introduce a shared abstraction for database initialization

Closes gh-46213
2025-10-22 13:37:57 -07:00
Phillip Webb 84274a2b40 Polish 'Introduce a shared abstraction for database initialization'
See gh-46213
2025-10-22 13:37:20 -07:00
Yanming Zhou 001230c389 Introduce a shared abstraction for database initialization
Add a new shared abstraction used by Spring Batch,
Spring Integration, Spring Session and Quartz.

See gh-46213

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-10-22 13:36:39 -07:00
Andy Wilkinson cb976ba38d Remove @Primary for auto-configured CBORMapper
Closes gh-47641
2025-10-22 16:27:35 +01:00
Stéphane Nicoll 85f330586a Document properties that were removed without a deprecation period
This commit documents properties that are removed without being
deprecated first. Previously those properties were undocumented.

Closes gh-47762
2025-10-22 16:56:44 +02:00
Stéphane Nicoll d8be5ca7c3 Document properties that were added as deprecated
This commit handles a corner case where we have to add properties in
a release that represents something we mean to remove but that's not
ready to go away just yet.

Those properties are now considered in the changelog, but  marked as
deprecated.

Closes gh-47759
2025-10-22 16:56:44 +02:00
Andy Wilkinson 1cfba0406e Merge pull request #47706 from var4609
* gh-47706:
  Migrate from Dokkatoo to Dokka

Closes gh-47706
2025-10-22 15:50:37 +01:00
Varun Patni f84b17c751 Migrate from Dokkatoo to Dokka
This commit migrates from Dokkatoo to Dokka for generation of Kotlin
API documentation.

See gh-47706

Signed-off-by: Varun Patni <varun.patni1@gmail.com>
2025-10-22 15:50:29 +01:00
Andy Wilkinson 918892fc1a Correct the contents of the Kotlin API documentation
Closes gh-47761
2025-10-22 15:50:22 +01:00
Moritz Halbritter 0ffc4649a6 Polish 2025-10-22 16:43:50 +02:00
Moritz Halbritter 5862d70725 Polish description of 'spring.http.converters.preferred-json-mapper' 2025-10-22 16:43:12 +02:00
Andy Wilkinson 4e94f26935 Support JMX endpoints when only Jackson 2 is present
Closes gh-47688
2025-10-22 14:40:59 +01:00
Andy Wilkinson 8292954076 Revert "Use spring.restdocs as prefix for Spring REST Docs properties"
This reverts commits a502f4d and 661574b.

Closes gh-47481
2025-10-22 13:27:14 +01:00
Andy Wilkinson 704456120a 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-47670
2025-10-22 10:48:23 +01:00
Andy Wilkinson 41092f36e0 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-47669
2025-10-22 10:48:09 +01:00
Andy Wilkinson c249d952ab Omit properties deprecated at error level from new appendix
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-47622
2025-10-22 10:46:35 +01:00
Andy Wilkinson 635e766aaf Make it easier to create executable and deployable war
Closes gh-46944
2025-10-22 10:13:46 +01:00
Stéphane Nicoll a3ca741c56 Merge branch '3.5.x'
Closes gh-47757
2025-10-22 10:14:03 +02:00
Stéphane Nicoll a57b796abf Merge branch '3.4.x' into 3.5.x
Closes gh-47756
2025-10-22 10:13:54 +02:00
Stéphane Nicoll 92e61fd328 Merge pull request #47416 from dependabot[bot]
* pr/47416:
  Polish "Bump gradle/actions from 4.4.4 to 5.0.0"
  Bump gradle/actions from 4.4.4 to 5.0.0

Closes gh-47416
2025-10-22 10:13:46 +02:00
Stéphane Nicoll ba27452de0 Polish "Bump gradle/actions from 4.4.4 to 5.0.0"
See gh-47416
2025-10-22 10:13:34 +02:00
dependabot[bot] f44def32ca Bump gradle/actions from 4.4.4 to 5.0.0
Bumps [gradle/actions](https://github.com/gradle/actions) from 4.4.4 to 5.0.0.
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](748248ddd2...4d9f0ba002)

---
updated-dependencies:
- dependency-name: gradle/actions
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

See gh-47416

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-22 10:12:44 +02:00
Stéphane Nicoll 95640adf5e Merge branch '3.5.x' 2025-10-22 09:28:32 +02:00
Stéphane Nicoll 250f418126 Upgrade to GraphQL Java 24.3
Closes gh-47755
2025-10-22 09:22:50 +02:00
Stéphane Nicoll bdb7ab77ba Merge branch '3.5.x' 2025-10-22 09:15:50 +02:00
Stéphane Nicoll 8569e2cccc Merge branch '3.4.x' into 3.5.x 2025-10-22 09:15:43 +02:00
Stéphane Nicoll 8af6500c17 Upgrade to Spring Integration 6.5.3
Closes gh-47615
2025-10-22 09:15:08 +02:00
Stéphane Nicoll bb57b713f2 Upgrade to Spring GraphQL 1.4.3
Closes gh-47754
2025-10-22 09:15:08 +02:00
Stéphane Nicoll 67c25d9eb6 Upgrade to Spring Integration 6.4.8
Closes gh-47611
2025-10-22 09:14:55 +02:00
Stéphane Nicoll e234684384 Upgrade to Spring Session 4.0.0-RC1
Closes gh-47500
2025-10-22 08:49:40 +02:00
Stéphane Nicoll 0bf9d3a37f Upgrade to Spring Pulsar 2.0.0-RC1
Closes gh-47497
2025-10-22 08:49:40 +02:00
Stéphane Nicoll 46a29e903a Upgrade to Spring Integration 7.0.0-RC1
Closes gh-47494
2025-10-22 08:49:40 +02:00
Stéphane Nicoll 7fcfdfe351 Upgrade to Spring GraphQL 2.0.0-RC1
Closes gh-47492
2025-10-22 08:49:40 +02:00
Stéphane Nicoll a7c4e9a049 Upgrade to Jackson Bom 3.0.1
Closes gh-47753
2025-10-22 08:49:39 +02:00
Phillip Webb 2eca59c738 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
2025-10-21 15:38:18 -07:00
Phillip Webb 55f00cf24c Fix merge issue causing checkArchitectureMain failure
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
See gh-47750
2025-10-21 15:37:26 -07:00
Phillip Webb b6648fcaed Downgrade to GraphQL Java 2.4.3
See gh-47492
2025-10-21 15:05:56 -07:00
Phillip Webb 350179901f Merge branch '3.5.x'
Closes gh-47751
2025-10-21 15:04:57 -07:00
Phillip Webb acaa938050 Merge branch '3.4.x' into 3.5.x
Closes gh-47750
2025-10-21 12:34:01 -07:00
Phillip Webb a2b9671778 Merge pull request #47429 from nosan
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
* pr/47429:
  Stop using @ConditionalOnClass on @Bean methods

Closes gh-47429
2025-10-21 12:28:04 -07:00
Dmytro Nosan ba88ec7ed1 Stop using @ConditionalOnClass on @Bean methods
See gh-47429

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-10-21 11:32:42 -07:00
Phillip Webb 739cb529fb Merge branch '3.5.x'
Closes gh-47749
2025-10-21 11:30:56 -07:00
Phillip Webb 7c16f9ac20 Merge branch '3.4.x' into 3.5.x
Closes gh-47748
2025-10-21 11:28:35 -07:00
Phillip Webb 4e4d3dafe3 Merge pull request #47747 from ngocnhan-tran1996
* pr/47747:
  Fix typos

Closes gh-47747
2025-10-21 11:28:25 -07:00
Tran Ngoc Nhan 4bebd47c4e Fix typos
See gh-47747
2025-10-21 11:27:41 -07:00
Phillip Webb 2210252c75 Drop @TestAutoConfiguration annotation
Closes gh-47746
2025-10-21 11:18:01 -07:00
Stéphane Nicoll 9ff3bc0f97 Merge branch '3.5.x' 2025-10-21 18:37:42 +02:00