Commit Graph
55309 Commits
Author SHA1 Message Date
Phillip Webb 4e8d711bc4 Merge branch 'main' into 4.0.x 2025-06-18 13:47:33 -07:00
Phillip Webb 8fcd4c6ece Merge branch '3.4.x'
Closes gh-46028
2025-06-18 13:47:16 -07:00
Phillip Webb aa4bf73464 Merge branch '3.3.x' into 3.4.x
Closes gh-46027
2025-06-18 13:46:56 -07:00
Phillip Webb 206785f838 Only cache JarFile URL keys that are cheap to lookup
Update `JarFileUrlKey` so that only URLs that have a cheap `equals()`
method call are cached. This should prevent expensive DNS lookups from
being performed.

Fixes gh-46015
2025-06-18 13:46:31 -07:00
Phillip Webb 7221a46d63 Merge branch 'main' into 4.0.x
Closes gh-46025
2025-06-18 10:20:47 -07:00
Phillip Webb 77877b4c69 Merge pull request #45969 from Rutujakolte03
* pr/45969:
  Polish 'Update README.adoc with link to CONTRIBUTING.adoc'
  Update README.adoc with link to CONTRIBUTING.adoc

Closes gh-45969
2025-06-18 10:20:24 -07:00
Phillip Webb 3906dfaffe Polish 'Update README.adoc with link to CONTRIBUTING.adoc'
See gh-45969
2025-06-18 10:19:21 -07:00
Rutuja 41421d9fd7 Update README.adoc with link to CONTRIBUTING.adoc
Update the README to help potential contributors find information.

See gh-45969

Signed-off-by: Rutuja  <134671220+Rutujakolte03@users.noreply.github.com>
2025-06-18 10:17:41 -07:00
Andy Wilkinson f9fdf1bfd8 Merge branch 'main' into 4.0.x 2025-06-18 17:47:10 +01:00
Andy Wilkinson 9d3686a255 Merge branch '3.4.x'
Closes gh-46023
2025-06-18 17:46:59 +01:00
Andy Wilkinson 29f09c9aec Merge branch '3.3.x' into 3.4.x
Closes gh-46022
2025-06-18 17:46:42 +01:00
Andy Wilkinson 8681b9445b Publish releases using Central Portal
Closes gh-46012
2025-06-18 17:46:24 +01:00
Andy Wilkinson 29dcf4d504 Merge branch 'main' into 4.0.x 2025-06-18 17:39:19 +01:00
Andy Wilkinson e525837c88 Merge branch '3.4.x'
Closes gh-46021
2025-06-18 17:39:07 +01:00
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 9c09bf859e Merge branch 'main' into 4.0.x 2025-06-18 17:38:20 +01:00
Andy Wilkinson d1ebe43805 Merge branch '3.4.x'
Closes gh-46019
2025-06-18 17:38:08 +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 db3fce0a64 Merge branch 'main' into 4.0.x 2025-06-18 14:19:24 +02:00
Stéphane Nicoll 550cebc0ec Merge branch '3.4.x' 2025-06-18 14:19:14 +02: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 f16da46233 Merge branch 'main' into 4.0.x 2025-06-18 13:34:16 +02:00
Moritz Halbritter a6798172c6 Merge branch '3.4.x'
Closes gh-46009
2025-06-18 13:34: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
Andy Wilkinson 00b5970666 Polish 6de3c1ce9d 2025-06-18 10:15:25 +01:00
Moritz Halbritter 8f5045b2a1 Merge branch 'main' into 4.0.x 2025-06-18 11:07:47 +02:00
Moritz Halbritter ac50eb73db Merge branch '3.4.x'
Closes gh-46006
2025-06-18 11:07:21 +02:00
Moritz Halbritter 498df4939f Remove unused JKS privateKeyPassword property from Couchbase
Closes gh-45883
2025-06-18 11:06:53 +02:00
Andy Wilkinson 6de3c1ce9d Merge branch 'main' into 4.0.x 2025-06-18 09:56:27 +01:00
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 80b1f9cc8b Merge branch 'main' into 4.0.x 2025-06-18 10:23:39 +02: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 4d349ec9d2 Merge branch 'main' into 4.0.x 2025-06-18 09:58:10 +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 486d0e9635 Merge branch 'main' into 4.0.x 2025-06-17 12:33:22 -07: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