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,194 Commits 24 Branches 369 Tags 279 MiB
Commit Graph

58194 Commits

Author SHA1 Message Date
Phillip Webb 62aae6e226 Release v4.0.0-RC1 2025-10-23 15:44:56 -07:00
Phillip Webb b582f5dabf Temporarily drop build stage 2025-10-23 15:44:11 -07:00
Phillip Webb 8e6bebea93 Set ignore-already-exists-error to true 2025-10-23 15:43:47 -07:00
Phillip Webb a22b3d1d62 Revert "Temporarily set ignore-already-exists-error to true" 
This reverts commit 1fc94ef97a.
 2025-10-23 15:24:13 -07:00
Phillip Webb 1fc94ef97a Temporarily set ignore-already-exists-error to true 2025-10-23 15:21:04 -07:00
Phillip Webb 0624dec7a9 Merge branch '3.5.x' 2025-10-23 15:19:15 -07:00
Phillip Webb 88c7198e79 Merge branch '3.4.x' into 3.5.x 2025-10-23 15:19:05 -07:00
Phillip Webb 8ebb971d63 Upgrade to spring-io/central-publish-action v0.3.0 2025-10-23 15:18:53 -07:00
Phillip Webb 67d5adc352 Polish and fix test starter descriptions
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-23 11:58:48 -07:00
Andy Wilkinson c0c66e2ac3 Update SNI test app to use spring-boot-starter-webmvc 2025-10-23 17:16:45 +01:00
Andy Wilkinson 8978d8c359 Avoid using deprecated spring-boot-starter-web 2025-10-23 16:34:54 +01:00
Stéphane Nicoll fb2e89875b Merge branch '3.5.x' 2025-10-23 15:12:53 +02:00
Stéphane Nicoll ce6423e565 Next development version (v3.5.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: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
2025-10-23 15:09:31 +02:00
Stéphane Nicoll 728cb95a17 Fix formatting 2025-10-23 14:12:50 +02:00
Stéphane Nicoll f409aca471 Add missing modules to configuration metadata changelog generator 
Closes gh-47758
 2025-10-23 14:03:54 +02:00
Stéphane Nicoll 915750f634 Upgrade to Spring Framework 7.0.0-RC2 
Closes gh-47743
 2025-10-23 13:56:37 +02:00
Andy Wilkinson 1275595f0b Make spring-boot-transaction an api dependency of spring-boot-jdbc 
Closes gh-47764
 2025-10-23 12:54:37 +01:00
Andy Wilkinson aa95282290 Polish `@since` tags 
Closes gh-47779
 2025-10-23 12:48:58 +01:00
Andy Wilkinson f5dbd8550f Stop Log4j2 configuration to hopefully close the log file
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 
See gh-47424
 2025-10-23 12:06:43 +01:00
Andy Wilkinson 2c563004d5 Clean up logging system properties to avoid test pollution 
See gh-47424
 2025-10-23 11:04:01 +01:00
Andy Wilkinson a120ed4383 Stop logger context so that file handlers are not leaked 
See gh-47424
 2025-10-23 11:04:01 +01:00
Stéphane Nicoll b965ae1f98 Add deprecation note for Jackson properties. 
This commit adds metadata for spring.jackson.generator and
spring.jackson.parser to hint at a partial replacement.

Closes gh-47778
 2025-10-23 11:44:25 +02:00
Stéphane Nicoll 835cd9d720 Merge pull request #47721 from quaff
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 
* pr/47721:
  Polish "Configure devtools to set trace probability to 100% by default"
  Configure devtools to set trace probability to 100% by default

Closes gh-47721
 2025-10-23 11:30:16 +02:00
Stéphane Nicoll ebcb646efb Polish "Configure devtools to set trace probability to 100% by default" 
See gh-47721
 2025-10-23 11:28:39 +02:00
Yanming Zhou 97e7753cdb Configure devtools to set trace probability to 100% by default 
See gh-47721

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-10-23 11:28:38 +02:00
Stéphane Nicoll ffc822d852 Revisit metrics and tracing test properties 
This commit renames 'spring.test.metrics.auto-configure' and
'spring.test.tracing.auto-configure' for consistency with the non-test
properties. It also adds a configuration metadata entry for
'spring.test.observability.auto-configure' that's superseded by these
two properties.

Closes gh-47776
 2025-10-23 11:18:53 +02:00
Moritz Halbritter 58d8b938ef Add dependency to spring-boot-starter-batch 
Closes gh-47777
 2025-10-23 11:08:52 +02:00
Stéphane Nicoll 26ea6b55ee Merge branch '3.5.x' 2025-10-23 10:49:14 +02:00
Stéphane Nicoll af07358549 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-47775
 2025-10-23 10:49:02 +02:00
Stéphane Nicoll b0bef35478 Document missing spring.test.* properties
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-47236
 2025-10-23 10:44:25 +02:00
Moritz Halbritter e4fbabd74d Merge branch '3.5.x' 2025-10-23 10:39:56 +02:00
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