spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity
59,000 Commits 24 Branches 394 Tags
495467dca6f1bed9932cf6d3796a44b034ccc164
Commit Graph
59000 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson 495467dca6 Make OTLP logging connection details back off 
Previously, the connection details would only back off if another
PropertiesOtlpLoggingConnectionDetails was defined. This commit
corrects this so that they will back of if any
OtlpLoggingConnectionDetails implementation is defined as a bean.

Closes gh-48536
 2025-12-16 08:42:18 +00:00
Stéphane Nicoll 5e5e8d9d0e Merge pull request #48543 from kzander91 
* pr/48543:
  Fix order comment in WebMvcWebApplicationTypeDeducer

Closes gh-48543
 2025-12-16 09:14:53 +01:00
Kai Zander fb05d82650 Fix order comment in WebMvcWebApplicationTypeDeducer 
See gh-48543

Signed-off-by: Kai Zander <61500114+kzander91@users.noreply.github.com>
 2025-12-16 09:14:34 +01:00
Stéphane Nicoll 9e69c556a1 Merge branch '3.5.x' 
Closes gh-48547
 2025-12-16 08:56:44 +01:00
Stéphane Nicoll e0627edea8 Merge branch '3.4.x' into 3.5.x 
Closes gh-48546
 2025-12-16 08:56:37 +01:00
Stéphane Nicoll acb22dc317 Merge pull request #48537 from dependabot[bot] 
* pr/48537:
  Bump actions/upload-artifact from 5 to 6

Closes gh-48537
 2025-12-16 08:56:28 +01:00
dependabot[bot] ef22eae306 Bump actions/upload-artifact from 5 to 6 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

See gh-48537

Signed-off-by: dependabot[bot] <support@github.com>
 2025-12-16 08:56:08 +01:00
Stéphane Nicoll 62364d5992 Upgrade to Testcontainers 2.0.3 
Closes gh-48545
 2025-12-16 08:47:34 +01:00
Stéphane Nicoll f893c223b2 Upgrade to Spring Session 4.0.1 
Closes gh-48445
 2025-12-16 08:47:34 +01:00
Stéphane Nicoll bc237ccaa1 Upgrade to Spring Pulsar 2.0.1 
Closes gh-48443
 2025-12-16 08:47:34 +01:00
Stéphane Nicoll b32ebb16ea Upgrade to Spring Kafka 4.0.1 
Closes gh-48441
 2025-12-16 08:47:34 +01:00
Stéphane Nicoll 84a9abb9e8 Upgrade to Spring AMQP 4.0.1 
Closes gh-48436
 2025-12-16 08:47:34 +01:00
Stéphane Nicoll b3ddf8e3e5 Upgrade to Netty 4.2.9.Final 
Closes gh-48544
 2025-12-16 08:47:34 +01:00
Stéphane Nicoll 7acd0feace Merge branch '3.5.x' 2025-12-16 08:34:27 +01:00
Stéphane Nicoll 9753401eaf Merge branch '3.4.x' into 3.5.x 2025-12-16 08:34:19 +01:00
Stéphane Nicoll 2d96cf2408 Upgrade to Testcontainers 1.21.4 
Closes gh-48542
 2025-12-16 08:34:02 +01:00
Stéphane Nicoll 49a1f78ebf Upgrade to Spring Pulsar 1.2.13 
Closes gh-48431
 2025-12-16 08:34:02 +01:00
Stéphane Nicoll c380296e69 Upgrade to Spring Authorization Server 1.5.5 
Closes gh-48426
 2025-12-16 08:34:02 +01:00
Stéphane Nicoll e923c1dff4 Upgrade to Netty 4.1.130.Final 
Closes gh-48541
 2025-12-16 08:34:02 +01:00
Stéphane Nicoll f2250afcd6 Upgrade to Spring Pulsar 1.2.13 
Closes gh-48420
 2025-12-16 08:26:41 +01:00
Stéphane Nicoll 575ab690d6 Upgrade to Spring Authorization Server 1.4.8 
Closes gh-48415
 2025-12-16 08:26:41 +01:00
Stéphane Nicoll d5e1cdb9d4 Upgrade to Hibernate 6.6.39.Final 
Closes gh-48540
 2025-12-16 08:19:36 +01:00
Stéphane Nicoll e0f1e6656e Upgrade to Netty 4.1.130.Final 
Closes gh-48539
 2025-12-16 08:11:02 +01:00
Stéphane Nicoll 06303a442b Upgrade to Hibernate 6.6.39.Final 
Closes gh-48538
 2025-12-16 08:10:58 +01:00
Phillip Webb da516741b2 Consider modules when deducing WebApplicationType 
Introduce a strategy to `WebApplicationType` to allow modules to
implement deduction logic.

Prior to this commit, modules played no part in deducing the
`WebApplicationType`. This meant that a user with `spring-webflux`
for client purposes would deduce `REACTIVE` despite no
`spring-boot-webflux` module being present.

The following deduction logic order is now implemented:

1) If the `spring-boot-webmvc` module is being used and Spring MVC
   classes are found then `SERVLET` is used.

2) If the `spring-boot-webflux` module is being used and Spring WebFlux
   classes are found then `REACTIVE` is used.

3) If `spring-web` is found and servlet classes are available then
   `SERVLET` is used.

4) If none of the above are satisfied, `NONE` is used.

This commit also updates `SpringBootTestContextBootstrapper` to use
the same deduction logic.

Fixes gh-48517
 2025-12-15 20:30:16 -08:00
Phillip Webb f9fa1346d1 Upgrade to Spring Security 7.0.2 
Closes gh-48444
 2025-12-15 15:11:04 -08:00
Andy Wilkinson 4c3d232f45 Upgrade to Hibernate 7.2.0.Final 
Closes gh-48518
 2025-12-15 17:30:56 +00:00
Stéphane Nicoll e8e880b8de Merge branch '3.5.x' 
Closes gh-48534
 2025-12-15 15:43:26 +01:00
Stéphane Nicoll 95e45e383e Merge branch '3.4.x' into 3.5.x 
Closes gh-48533
 2025-12-15 15:43:18 +01:00
Stéphane Nicoll e04737fc31 Merge pull request #48525 from dmitrysulman 
* pr/48525:
  Remove outdated reference to Jackson Kotlin Module

Closes gh-48525
 2025-12-15 15:43:13 +01:00
Dmitry Sulman e7d7dd887e Remove outdated reference to Jackson Kotlin Module 
See gh-48525

Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
 2025-12-15 15:33:39 +01:00
Stéphane Nicoll 21aedaad3c Refine behavior of @AutoConfigureCache 
Closes gh-48522
 2025-12-15 15:25:09 +01:00
Stéphane Nicoll 134ebe42a7 Merge branch '3.5.x' 
Closes gh-48532
 2025-12-15 15:15:11 +01:00
Stéphane Nicoll 99fc80275b Merge branch '3.4.x' into 3.5.x 
Closes gh-48531
 2025-12-15 15:06:54 +01:00
Stéphane Nicoll a5b2086370 Improve caching documentation with regards to running tests 
Closes gh-48529
 2025-12-15 15:02:08 +01:00
Stéphane Nicoll 10e2f34ecc Merge branch '3.5.x' 
Closes gh-48527
 2025-12-15 12:04:24 +01:00
Stéphane Nicoll 6f61d84c2a Merge branch '3.4.x' into 3.5.x 
Closes gh-48526
 2025-12-15 12:04:02 +01:00
Stéphane Nicoll 56e41d5877 Add a note that Log4J requires log path for file rotation 
Closes gh-48524
 2025-12-15 12:01:02 +01:00
Stéphane Nicoll 61e427c101 Merge branch '3.5.x' 
Closes gh-48516
 2025-12-12 16:24:45 +01:00
Stéphane Nicoll 559106f8a9 Add Log4j2 smoke test 
This commit adds a smoke test that exercises the SpringProfile extension
just like the Logback equivalent.

Closes gh-48492
 2025-12-12 16:14:05 +01:00
Stéphane Nicoll b881f92812 Merge branch '3.5.x' 2025-12-12 15:03:06 +01:00
Stéphane Nicoll 33136579d5 Merge branch '3.4.x' into 3.5.x 2025-12-12 15:03:00 +01:00
Stéphane Nicoll 77ec3432cc Upgrade to Spring Data Bom 2025.1.1 
Closes gh-48438
 2025-12-12 15:02:55 +01:00
Stéphane Nicoll a1164d8c08 Upgrade to Spring Data Bom 2025.0.7 
Closes gh-48427
 2025-12-12 15:02:09 +01:00
Stéphane Nicoll 6cbe9a4f29 Upgrade to Spring Data Bom 2024.1.13 
Closes gh-48416
 2025-12-12 14:52:40 +01:00
Stéphane Nicoll 78d4193ef8 Merge branch '3.5.x' 2025-12-12 14:47:40 +01:00
Stéphane Nicoll 40b0b6a937 Merge branch '3.4.x' into 3.5.x 2025-12-12 14:47:35 +01:00
Stéphane Nicoll 3b9321e0a2 Prevent upgrade to Netty 4.2.8.Final 
Closes gh-48511
 2025-12-12 14:47:15 +01:00
Stéphane Nicoll a416d29c94 Prevent upgrade to Netty 4.1.129.Final 
Closes gh-48508
 2025-12-12 14:46:02 +01:00
Stéphane Nicoll a1caf583a9 Prevent upgrade to Netty 4.1.129.Final 
Closes gh-48505
 2025-12-12 14:43:33 +01:00