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

54161 Commits

Author SHA1 Message Date
Andy Wilkinson 95a569987f Merge branch '3.3.x' into 3.4.x 
Closes gh-46020
 2025-06-18 17:38:57 +01:00
Andy Wilkinson 13d265c282 Merge pull request #46016 from davidlj95 
* gh-46016:
  Fix Docker security options broken link in OCI images packaging docs

Closes gh-46016
 2025-06-18 17:38:41 +01:00
Andy Wilkinson 7560e38adf Merge branch '3.3.x' into 3.4.x 
Closes gh-46018
 2025-06-18 17:37:52 +01:00
David LJ f4e04227f7 Fix Docker security options broken link in OCI images packaging docs 
See gh-46016

Signed-off-by: David LJ <mail@davidlj95.com>
 2025-06-18 17:36:55 +01:00
Andy Wilkinson bab9071539 Revert "Work around Spring Framework cache pollution bug" 
This reverts commit 4af0ee20d1.

Closes gh-45984
 2025-06-18 16:10:05 +01:00
Stéphane Nicoll 410485f873 Merge branch '3.3.x' into 3.4.x 2025-06-18 14:19:05 +02:00
Stéphane Nicoll f6c88840e0 Upgrade to Spring Integration 6.3.11 
Closes gh-45756
 2025-06-18 14:16:04 +02:00
Moritz Halbritter d4db78987c Merge branch '3.3.x' into 3.4.x 
Closes gh-46008
 2025-06-18 13:33:54 +02:00
Moritz Halbritter 6ef1830bc8 Document that /error is secured by default 
Closes gh-45663
 2025-06-18 13:33:38 +02:00
Moritz Halbritter 498df4939f Remove unused JKS privateKeyPassword property from Couchbase
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 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-45883
 2025-06-18 11:06:53 +02:00
Andy Wilkinson b6d8e72891 Merge branch '3.3.x' into 3.4.x 
Closes gh-45870
 2025-06-18 09:54:24 +01:00
Andy Wilkinson d9e4b66eee Add properties for new max part count and max part header size
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: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 
To address CVE-2025-48976 and CVE-2025-48988, Tomcat 10.1.42 has
introduced two new configuration settings – maxPartCount and
maxPartHeaderSize. The default values for these configuration
settings have proven hard to get right and some applications have
had to increase the default limits. To ease their configuration in
Spring Boot, this commit introduces configuration properties for
the new settings:

-  server.tomcat.max-part-count (maxPartCount)
-  server.tomcat.max-part-header-size (maxPartHeaderSize)

The defaults are aligned with those of Tomcat 10.1.42
(10 and 512 bytes respectively).

Closes gh-45869
 2025-06-18 09:46:09 +01:00
Moritz Halbritter 84e0db53b3 Merge branch '3.3.x' into 3.4.x 
Closes gh-46004
 2025-06-18 10:23:19 +02:00
Moritz Halbritter 0f77dcb402 Use system properties to detect OpenJ9 JVMs when doing heapdumps 
Closes gh-45973
 2025-06-18 10:16:25 +02:00
Moritz Halbritter 22eec46ff7 Merge pull request #46001 from izeye 
* pr/46001:
  Polish gh-45721

Closes gh-46001
 2025-06-18 09:57:32 +02:00
Johnny Lim c6ba46c120 Polish gh-45721 
See gh-46001

Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-06-18 09:55:45 +02:00
Andy Wilkinson 8893f4c18b 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[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 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-45999
 2025-06-17 20:05:53 +01:00
Andy Wilkinson c13dc92286 Test against Gradle 7.6.5
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: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-45998
 2025-06-17 20:05:03 +01:00
Stéphane Nicoll ddc47db0e9 Merge branch '3.3.x' into 3.4.x 2025-06-17 20:32:10 +02:00
Stéphane Nicoll 23b011760d Upgrade to Spring WS 4.0.15 
Closes gh-45775
 2025-06-17 20:31:54 +02:00
Stéphane Nicoll e4609284ce Upgrade to Spring Session 3.4.4 
Closes gh-45774
 2025-06-17 20:31:54 +02:00
Stéphane Nicoll 77e27b758a Upgrade to Spring Kafka 3.3.7 
Closes gh-45769
 2025-06-17 20:31:54 +02:00
Stéphane Nicoll 7b8b18b964 Upgrade to Spring Authorization Server 1.4.4 
Closes gh-45766
 2025-06-17 20:31:54 +02:00
Stéphane Nicoll c96d674ffb Upgrade to Spring WS 4.0.15 
Closes gh-45762
 2025-06-17 20:31:46 +02:00
Stéphane Nicoll 0d9fc6d069 Upgrade to Spring Kafka 3.2.10 
Closes gh-45757
 2025-06-17 20:31:46 +02:00
Stéphane Nicoll cf5a3b9bab Upgrade to Spring Authorization Server 1.3.7 
Closes gh-45753
 2025-06-17 20:31:46 +02:00
Andy Wilkinson d7e20968d1 Merge branch '3.3.x' into 3.4.x 
Closes gh-45996
 2025-06-17 19:19:02 +01:00
Andy Wilkinson a6ac444aba Use fixed timestamp so included snippets match accompanying text 
Closes gh-45995
 2025-06-17 19:06:41 +01:00
Stéphane Nicoll 0f4e7ba7ba 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[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 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-45991
 2025-06-17 14:57:27 +02:00
Stéphane Nicoll e914539804 Merge pull request #45976 from chanbinme
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: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 
* pr/45976:
  Polish "Avoid NPE in SimpleDataSourceProperties when driver is null"
  Avoid NPE in SimpleDataSourceProperties when driver is null

Closes gh-45976
 2025-06-17 14:57:24 +02:00
Stéphane Nicoll 1f031f5fa6 Polish "Avoid NPE in SimpleDataSourceProperties when driver is null" 
See gh-45976
 2025-06-17 14:53:57 +02:00
chanbinme 1cf0d4e7fe Avoid NPE in SimpleDataSourceProperties when driver is null 
See gh-45976

Signed-off-by: chanbinme <gksmfcksqls@gmail.com>
 2025-06-17 14:38:50 +02:00
Stéphane Nicoll 8deffd265b Merge pull request #45967 from wonyongg 
* pr/45967:
  Update copyright year of changed file
  Unify use of org.apache.logging.log4j.core.LoggerContext

Closes gh-45967
 2025-06-17 14:26:13 +02:00
Stéphane Nicoll 543ac3617b Update copyright year of changed file 
See gh-45967
 2025-06-17 14:23:44 +02:00
wonyongg 3bf0f3d6e2 Unify use of org.apache.logging.log4j.core.LoggerContext 
See gh-45967

Signed-off-by: wonyongg <111210881+wonyongg@users.noreply.github.com>
 2025-06-17 14:22:51 +02:00
Stéphane Nicoll 5e65e929b7 Merge branch '3.3.x' into 3.4.x 
Closes gh-45988
 2025-06-17 14:20:59 +02:00
Stéphane Nicoll 5a2a6dbe00 Merge pull request #45975 from nicolasgarea 
* pr/45975:
  Remove double comma in Checkstyle configuration

Closes gh-45975
 2025-06-17 14:20:43 +02:00
Nicolas Garea 120aab0693 Remove double comma in Checkstyle configuration 
See gh-45975

Signed-off-by: Nicolas Garea <nicogareacidre@gmail.com>
 2025-06-17 14:19:22 +02:00
Stéphane Nicoll 066773c1d7 Merge branch '3.3.x' into 3.4.x 
Closes gh-45986
 2025-06-17 14:15:46 +02:00
Stéphane Nicoll 1666577e5f Merge pull request #45977 from dependabot[bot] 
* pr/45977:
  Polish "Bump gradle/actions from 4.4.0 to 4.4.1"
  Bump gradle/actions from 4.4.0 to 4.4.1

Closes gh-45977
 2025-06-17 14:15:42 +02:00
Stéphane Nicoll b727309ff8 Polish "Bump gradle/actions from 4.4.0 to 4.4.1" 
See gh-45977
 2025-06-17 14:15:14 +02:00
dependabot[bot] eaecdcbdd2 Bump gradle/actions from 4.4.0 to 4.4.1 
Bumps [gradle/actions](https://github.com/gradle/actions) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](8379f6a132...ac638b010c)

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

See gh-45977

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-17 14:14:53 +02:00
Stéphane Nicoll 89ef0210a8 Merge branch '3.3.x' into 3.4.x 2025-06-17 14:06:04 +02:00
Stéphane Nicoll 295de4f981 Upgrade to Spring Security 6.4.7 
Closes gh-45773
 2025-06-17 11:09:21 +02:00
Stéphane Nicoll 68778d52a5 Upgrade to Spring RESTDocs 3.0.4 
Closes gh-45772
 2025-06-17 11:09:21 +02:00
Stéphane Nicoll 3dc1c3b946 Upgrade to Spring Pulsar 1.2.7 
Closes gh-45771
 2025-06-17 11:09:21 +02:00
Stéphane Nicoll 691a42ff1b Upgrade to Spring Security 6.3.10 
Closes gh-45761
 2025-06-17 11:09:15 +02:00
Stéphane Nicoll 988fbb90f8 Upgrade to Spring RESTDocs 3.0.4 
Closes gh-45760
 2025-06-17 11:09:15 +02:00
Stéphane Nicoll faef2ce6c0 Upgrade to Spring Pulsar 1.1.13 
Closes gh-45759
 2025-06-17 11:09:15 +02:00
Stéphane Nicoll acd7aee309 Upgrade to Spring AMQP 3.1.12 
Closes gh-45752
 2025-06-17 11:09:14 +02:00