root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
58,713 Commits 24 Branches 369 Tags 279 MiB
Commit Graph

58713 Commits

Author SHA1 Message Date
Moritz Halbritter 6683d0f496 Merge branch '3.4.x' into 3.5.x 2025-10-23 10:39:44 +02:00
Moritz Halbritter 5ba3642364 Next development version (v3.4.12-SNAPSHOT) 2025-10-23 10:38:32 +02:00
Stéphane Nicoll 3b8a35f531 Remove configuration-properties plugin 
The webflux-test module only has manual metadata so we shouldn't use
the plugin as it kicks of the annotation processor and that doesn't
generate anything.
 2025-10-23 09:26:29 +02:00
Phillip Webb 08819f0b0d Merge pull request #47424 from ppkarwasz 
* pr/47424:
  Polish 'Simplify Log4J2LoggingSystem'
  Simplify Log4J2LoggingSystem

Closes gh-47424
 2025-10-22 23:49:46 -07:00
Stéphane Nicoll 152635159c Complete modules to be used for generating the changelog 
See gh-47758
 2025-10-23 08:46:27 +02:00
Phillip Webb 1a8402e938 Polish 'Simplify Log4J2LoggingSystem' 
See gh-47424
 2025-10-22 23:46:21 -07:00
Piotr P. Karwasz 7d34320401 Simplify Log4J2LoggingSystem 
Streamline and harden `Log4J2LoggingSystem` by delegating more
functionality. The commit makes updates in two key areas:

Previously, each method fetched the `LoggerContext` directly from
`LogManager` and cast it to `....core.LoggerContext`. This approach
has several issues:

* ClassCastException risks:
  - When Log4j Core is on the classpath but not the active implementation
    (e.g. when `log4j-to-slf4j` is used).
  - During shutdown, when `LogManager` may return a `SimpleLoggerContext`
    (see spring-projects/spring-boot#26953).

* Unexpected reinitialization:
  - If the logger context had already been stopped, `Log4J2LoggingSystem`
    would trigger creation of a new context, even mid-shutdown.

Configuration file detection was previously hardcoded in
`Log4J2LoggingSystem`, which limited flexibility:

* Harder to support additional configuration formats.

* Coupled Spring Boot to internal Log4j Core classes such as
  `AuthorizationProvider`.

This change now delegates configuration resolution to Log4j. This reduces
reliance on internal APIs and allows Log4j Core to handle configuration
formats and factories more naturally.

Signed-off-by: Piotr P. Karwasz <piotr@github.copernik.eu>

See gh-47424
 2025-10-22 23:41:11 -07:00
Phillip Webb debbec8ee1 Merge branch '3.5.x' 
Closes gh-47772
 2025-10-22 22:15:43 -07:00
Phillip Webb 59aba4e54d Merge branch '3.4.x' into 3.5.x 
Closes gh-47771
 2025-10-22 22:06:30 -07:00
Phillip Webb 4525a0c3d4 Merge pull request #47284 from DKARAGODIN 
* pr/47284:
  Write signature files to uber wars for Oracle Java 17 verification

Closes gh-47284
 2025-10-22 22:05:39 -07:00
Dmitrii Karagodin 43d91aee38 Write signature files to uber wars for Oracle Java 17 verification 
Extend commit 33c5e126 to include uber Wars.

See gh-47284

Signed-off-by: Dmitrii Karagodin <4319788@gmail.com>
 2025-10-22 20:27:53 -07:00
Phillip Webb 770c94607c Refine 'Introduce a shared abstraction for database initialization' 
Use test fixtures to keep getSettings() package-private

See gh-46213
 2025-10-22 19:54:46 -07:00
Phillip Webb 87954afe37 Upgrade to Spring Batch 6.0.0-RC1
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-47484
 2025-10-22 16:55:06 -07:00
Phillip Webb 0789b07169 Upgrade to Cassandra Driver 4.19.1 
Closes gh-47770
 2025-10-22 16:55:05 -07:00
Phillip Webb 98e124df8f Upgrade to ActiveMQ 6.1.8 
Closes gh-47769
 2025-10-22 16:55:01 -07:00
Phillip Webb 4b3b9168be Merge branch '3.5.x' 2025-10-22 16:50:25 -07:00
Phillip Webb eaad688dd2 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: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-47487
 2025-10-22 16:49:57 -07:00
Phillip Webb edee2de837 Upgrade to Cassandra Driver 4.19.1 
Closes gh-47768
 2025-10-22 16:49:57 -07:00
Phillip Webb 2bfc31e696 Upgrade to ActiveMQ 6.1.8 
Closes gh-47767
 2025-10-22 16:49:53 -07:00
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