spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-24 18:29:03 +00:00
Code Issues Projects Releases Wiki Activity
55,043 Commits 28 Branches 395 Tags
fa81ecddc19a78694f31a765264adc0e5392e64b
Commit Graph
55043 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson fa81ecddc1 Merge branch '3.4.x' 
Closes gh-45872
 2025-06-18 09:56:06 +01: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 
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 01cb25e7a4 Merge branch '3.4.x' 
Closes gh-46005
 2025-06-18 10:23:31 +02: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 86f736b677 Merge branch '3.4.x' 
Closes gh-46002
 2025-06-18 09:58:01 +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
Phillip Webb ccdd79fe16 Merge pull request #45968 from tanruian 
* pr/45968:
  Polish 'Improve binding performance of 'local.management.port' property source'
  Improve binding performance of 'local.management.port' property source

Closes gh-45968
 2025-06-17 12:32:13 -07:00
Phillip Webb ad0f08f8a2 Polish 'Improve binding performance of 'local.management.port' property source' 
See gh-45968
 2025-06-17 12:32:13 -07:00
Phillip Webb 8f14dca164 Restore IndexedElementsBinder knownIndexedChildren checking logic 
Restore knownIndexedChildren logic in IndexedElementsBinder to that of
Spring Boot 3.4, effectively reverting commit 93113a415f.

The performance improvements unfortunately caused the unwanted
side-effect of no longer checking the all indexed elements were fully
bound. Performance was also actually reduced for non iterable property
sources that used deeply nested structures.

In order to keep some performance improvements, the updated code
also makes the following changes:

* A `Set` is used rather than `LinkedMultiValueMap` for tracking. The
  full list of unbound properties are now only calculated when the
  exception is thrown.

* If possible, the source is filtered early and passed down for child
  element binding. This should help reduce repeated full scans of
  all configuration property names.

* The `FilteredIterableConfigurationPropertiesSource` has been optimized
  for immutable `SpringIterableConfigurationPropertySource` use.

Fixes gh-45994
See gh-45970
See gh-44867
 2025-06-17 12:32:12 -07:00
tanruian d5464a44f0 Improve binding performance of 'local.management.port' property source 
Update `ManagementContextAutoConfiguration` to use an immutable
`EnumerablePropertySource` to provide better property binding
performance.

See gh-45968

Signed-off-by: tanruian <tanruiantra@qq.com>
 2025-06-17 12:32:12 -07:00
Andy Wilkinson 34a8f3773d Merge branch '3.4.x' 
Closes gh-46000
 2025-06-17 20:06:38 +01:00
Andy Wilkinson 8893f4c18b Merge branch '3.3.x' into 3.4.x 
Closes gh-45999
 2025-06-17 20:05:53 +01:00
Andy Wilkinson c13dc92286 Test against Gradle 7.6.5 
Closes gh-45998
 2025-06-17 20:05:03 +01:00
Stéphane Nicoll 7838bfeb48 Merge branch '3.4.x' 2025-06-17 20:33:06 +02:00
Stéphane Nicoll 2f1c7be451 Upgrade to Spring Session 3.5.1 
Closes gh-45787
 2025-06-17 20:32:59 +02:00
Stéphane Nicoll da66949792 Upgrade to Spring Kafka 3.3.7 
Closes gh-45782
 2025-06-17 20:32:59 +02:00
Stéphane Nicoll 575a25d678 Upgrade to Spring Authorization Server 1.5.1 
Closes gh-45779
 2025-06-17 20:32:59 +02: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 82f9491a74 Improve description of TestRestTemplate's Apache client defaults 
Closes gh-45842
 2025-06-17 19:30:16 +01:00
Andy Wilkinson 2e423a75a6 Merge branch '3.4.x' 
Closes gh-45997
 2025-06-17 19:19:22 +01: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 943fd348b4 Merge branch '3.4.x' 
Closes gh-45992
 2025-06-17 14:57:34 +02:00
Stéphane Nicoll 0f4e7ba7ba Merge branch '3.3.x' into 3.4.x 
Closes gh-45991
 2025-06-17 14:57:27 +02:00
Stéphane Nicoll e914539804 Merge pull request #45976 from chanbinme 
* 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 28c095c3be Merge branch '3.4.x' 
Closes gh-45990
 2025-06-17 14:26:18 +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 83e3b04c59 Merge branch '3.4.x' 
Closes gh-45989
 2025-06-17 14:21:06 +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 e74bcebbc8 Merge branch '3.4.x' 
Closes gh-45987
 2025-06-17 14:15:51 +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](https://github.com/gradle/actions/compare/8379f6a1328ee0e06e2bb424dadb7b159856a326...ac638b010cf58a27ee6c972d7336334ccaf61c96)

---
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