spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-23 01:39:02 +00:00
Code Issues Projects Releases Wiki Activity
58,704 Commits 28 Branches 394 Tags
dc140dfc2ea951b75dbb2ba910972318d919759d
Commit Graph
58704 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stéphane Nicoll dc140dfc2e Upgrade to Spring Framework 7.0.1 
Closes gh-48168
 2025-11-20 10:48:40 +01:00
Andy Wilkinson 75da8b80ec Align restclient-test properties with module's name 
Closes gh-48193
 2025-11-20 09:20:02 +00:00
Andy Wilkinson 331e9bcbf7 Remove metadata for previously deleted property 
Closes gh-48199
 2025-11-20 09:15:42 +00:00
Andy Wilkinson 81ec7aeb70 Fix clashing bean name with JsonTest and Jacksons 2 and 3 
Fixes gh-48198
 2025-11-20 09:14:46 +00:00
Moritz Halbritter 21b27df695 Merge branch '3.5.x' 2025-11-20 10:04:14 +01:00
Moritz Halbritter 3b539aa9b4 Merge branch '3.4.x' into 3.5.x 
Closes gh-48166
 2025-11-20 10:03:52 +01:00
Moritz Halbritter ee70d55976 Upgrade to Spring Framework 6.2.14 
Closes gh-48165
 2025-11-20 09:56:38 +01:00
Phillip Webb 2685f4bf29 Change tomcat and jetty runtime modules to starters 
Change `spring-boot-tomcat-runtime` and `spring-boot-jetty-runtime`
into starter POMs and reduce the number of dependencies needed for
`spring-boot-tomcat` and `spring-boot-jetty`.

The runtime starters provide only the jars required to run the
embedded server along with the module jar itself (excluding transitive
dependencies) and `spring-boot-webserver` (excluding transitive
dependencies).

The build setup required for an executable jar is slightly different
between Maven and Gradle. For Maven, the regular module is put in the
`provided` scope. For Gradle, the regular module remains in main
configuration and the runtime jar is put in the `providedRuntime`
configuration. The reference documentation has been updated to
show how to configure things if starters are being used.

Manual testing has been performed to ensure that wars build with Maven
and Gradle work with both Tomcat and Jetty in both deployed and
`java -jar` modes.

Closes gh-48175
 2025-11-19 21:59:03 -08:00
Phillip Webb 2e75008ba1 Merge branch '3.5.x' 
Closes gh-48197
 2025-11-19 21:58:48 -08:00
Phillip Webb f7b4a8b377 Merge branch '3.4.x' into 3.5.x 
Closes gh-48196
 2025-11-19 21:58:36 -08:00
Phillip Webb 4a8d01d2b6 Exclude starter POMs from lib-provided when using Gradle 
Fixes gh-48195
 2025-11-19 21:58:03 -08:00
Phillip Webb 97d58c21ce Merge branch '3.5.x' 2025-11-19 10:35:08 -08:00
Phillip Webb 0bb0d5370a Merge branch '3.4.x' into 3.5.x 
Closes gh-48192
 2025-11-19 10:34:56 -08:00
Phillip Webb 4625534e83 Force Testcontainers Docker API version for Docker 29.0.0+ compatibility 
Add `docker-java.properties` to spring-boot-testcontainers and
`spring-boot-test` to force an API version upgrade.

Fixes gh-48104
 2025-11-19 10:33:34 -08:00
Phillip Webb 058e455cd8 Merge branch '3.5.x' 
Closes gh-48190
 2025-11-19 09:38:25 -08:00
Phillip Webb 7891ebf8b1 Merge branch '3.4.x' into 3.5.x 
Closes gh-48189
 2025-11-19 09:38:12 -08:00
Phillip Webb b0f50581bc Upgrade to antora-ui-spring v0.4.21 
Closes gh-48188
 2025-11-19 09:37:42 -08:00
Stéphane Nicoll be063b695a Upgrade to Spring Batch 6.0.0 
Closes gh-47834
 2025-11-19 17:40:40 +01:00
Stéphane Nicoll d451da604b Merge branch '3.5.x' 2025-11-19 15:57:51 +01:00
Stéphane Nicoll 885a83407f Upgrade to Kafka 4.1.1 
Closes gh-48185
 2025-11-19 15:56:51 +01:00
Stéphane Nicoll c8f8798a7d Upgrade to Cassandra Driver 4.19.2 
Closes gh-48184
 2025-11-19 15:56:51 +01:00
Andy Wilkinson 7f15cc827b Upgrade to Spring RESTDocs 4.0.0 
Closes gh-47831
 2025-11-19 14:46:39 +00:00
Stéphane Nicoll 833b6daf98 Upgrade to Cassandra Driver 4.19.2 
Closes gh-48183
 2025-11-19 15:33:20 +01:00
Moritz Halbritter 3a13d07301 Merge branch '3.5.x' 
Closes gh-48182
 2025-11-19 15:08:19 +01:00
Moritz Halbritter 0addec6b68 Fix bug in SslMeterBinder when binding without registered bundles 
Before this commit the meter registries were derived from the created
gauges. If the SslMeterBinder has been bound to a MeterRegistry without
any bundles, then no gauges are created. If a SslBundle is then
dynamically added, onBundleChange is called with the new bundle, but the
list of meter registries is empty (because we have no gauges). The
effect is that the newly registered bundle has no metrics.

Closes gh-48180
 2025-11-19 15:06:09 +01:00
Moritz Halbritter 968a85156d Merge branch '3.5.x' 2025-11-19 15:04:32 +01:00
Moritz Halbritter 0b92b8177c Polish SslMeterBinderTests 2025-11-19 14:28:47 +01:00
Stéphane Nicoll 8b1e937677 Merge branch '3.5.x' 2025-11-19 07:55:29 +01:00
Stéphane Nicoll e1c790716d Merge branch '3.4.x' into 3.5.x 2025-11-19 07:53:11 +01:00
Stéphane Nicoll e7aeb036f0 Upgrade to Spring Integration 6.5.4 
Closes gh-48040
 2025-11-19 07:53:06 +01:00
Stéphane Nicoll bae83f997d Upgrade to Spring WS 5.0.0 
Closes gh-47833
 2025-11-19 07:52:59 +01:00
Stéphane Nicoll 9d3434e5b6 Upgrade to Spring Integration 7.0.0 
Closes gh-47828
 2025-11-19 07:52:59 +01:00
Stéphane Nicoll ab218f9bcd Upgrade to Spring GraphQL 2.0.0 
Closes gh-47826
 2025-11-19 07:52:59 +01:00
Stéphane Nicoll 1497f9379e Upgrade to Spring Integration 6.4.9 
Closes gh-48026
 2025-11-19 07:52:40 +01:00
Phillip Webb c42364ce88 Revert "Merge pull request #46818 from BenchmarkingBuffalo" 
This reverts commit 4730dcfef7, reversing
changes made to 024bb7278e.

See gh-46818
 2025-11-18 17:24:29 -08:00
Phillip Webb d4b9786b8b Merge branch '3.5.x' 
Closes gh-48177
 2025-11-18 17:08:35 -08:00
Phillip Webb 4a016ec04d Merge branch '3.4.x' into 3.5.x 
Closes gh-48176
 2025-11-18 16:10:05 -08:00
Phillip Webb 3040dc14cd Apply system environment prefix to management context 
Update `ManagementContextFactory` so that any system environment prefix
set on the parent environment is applied to the child.

Closes gh-45858
 2025-11-18 15:44:49 -08:00
Stéphane Nicoll ae4bf3e501 Disable Elasticsearch client's sniffer by default 
This commit switches the auto-configuration of Elasticsearch to not
contribute a client's sniffer by default.

This matches the best practices as describe in
https://www.elastic.co/blog/elasticsearch-sniffing-best-practices-what-when-why-how

Closes gh-48155
 2025-11-18 23:03:25 +01:00
Andy Wilkinson b1d78efbf3 Merge branch '3.5.x' 
Closes gh-48174
 2025-11-18 16:40:47 +00:00
Andy Wilkinson 45f4da7eef Merge branch '3.4.x' into 3.5.x 
Closes gh-48173
 2025-11-18 16:40:36 +00:00
Andy Wilkinson aecdff1bbd Merge pull request #48172 from dependabot[bot] 
* gh-48172:
  Bump js-yaml from 4.1.0 to 4.1.1 in /antora

Closes gh-48172
 2025-11-18 16:40:23 +00:00
dependabot[bot] 7bc2fa0eab Bump js-yaml from 4.1.0 to 4.1.1 in /antora 
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 4.1.0 to 4.1.1.
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/4.1.0...4.1.1)

---
updated-dependencies:
- dependency-name: js-yaml
  dependency-version: 4.1.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

See gh-48172
 2025-11-18 16:40:01 +00:00
Stéphane Nicoll e67f2fb96b Merge pull request #48170 from vpavic 
* pr/48170:
  Polish contribution
  Mention support for detecting AWS ECS in "Deploying to the Cloud"

Closes gh-48170
 2025-11-18 16:23:04 +01:00
Stéphane Nicoll 15bf80d3ff Polish contribution 
See gh-48170
 2025-11-18 16:22:11 +01:00
Vedran Pavic 802dacb007 Mention support for detecting AWS ECS in "Deploying to the Cloud" 
See gh-48170

Signed-off-by: Vedran Pavic <vedran@vedranpavic.com>
 2025-11-18 16:08:03 +01:00
Stéphane Nicoll 44e29b654d Merge branch '3.5.x' 
Closes gh-48171
 2025-11-18 16:07:34 +01:00
Stéphane Nicoll bb247e82aa Merge pull request #48153 from TerryTaoYY 
* pr/48153:
  Hande SSL metrics for dynamically registered bundles

Closes gh-48153
 2025-11-18 16:07:26 +01:00
TerryTaoYY 8214f3c22b Hande SSL metrics for dynamically registered bundles 
See gh-48153

Signed-off-by: TerryTaoYY <yueyang.tao@gmail.com>
 2025-11-18 15:25:35 +01:00
Andy Wilkinson 3d8c439091 Upgrade to Gradle 9.2.1 
Closes gh-48167
 2025-11-18 12:29:23 +00:00