Commit Graph
59754 Commits
Author SHA1 Message Date
Andy Wilkinson b6dccd4fd6 Upgrade to Jackson 2 Bom 2.21.2
Closes gh-49764
2026-03-25 12:30:00 +00:00
Andy Wilkinson 9dfb854dae Upgrade to Brave 6.3.1
Closes gh-49763
2026-03-25 12:29:56 +00:00
Andy Wilkinson d9ac9f9de1 Upgrade to Zipkin Reporter 3.5.3
Closes gh-49762
2026-03-25 12:29:52 +00:00
Andy Wilkinson c9d31ef909 Merge branch '3.5.x' into 4.0.x 2026-03-25 12:27:52 +00:00
Andy Wilkinson 4b37ecbf6d Upgrade to Undertow 2.3.24.Final
Closes gh-49761
2026-03-25 12:12:04 +00:00
Andy Wilkinson 32a51d5d70 Upgrade to Tomcat 10.1.53
Closes gh-49760
2026-03-25 12:11:56 +00:00
Andy Wilkinson 0934296141 Upgrade to Netty 4.1.132.Final
Closes gh-49759
2026-03-25 12:11:48 +00:00
Andy Wilkinson 851ddda422 Upgrade to jOOQ 3.19.31
Closes gh-49758
2026-03-25 12:11:40 +00:00
Andy Wilkinson ef876fe5d2 Upgrade to Hibernate 6.6.45.Final
Closes gh-49757
2026-03-25 12:11:32 +00:00
Andy Wilkinson 2841d874cf Upgrade to Zipkin Reporter 3.5.3
Closes gh-49756
2026-03-25 12:11:24 +00:00
Andy Wilkinson 96eea1812d Fix WebSocketMessagingAutoConfiguration without a JsonMapper bean
Previously, if Jackson was on the classpath but no JsonMapper bean
was present, the app would fail to start. This commit updates
the auto-configuration so that the parts that require a JsonMapper
bean back of when no such bean is present.

The sample problem also exists with Jackson 2 and an ObjectMapper
bean. This commit also corrects that.

Fixes gh-49749
2026-03-25 11:55:39 +00:00
Andy Wilkinson 9851e67079 Merge branch '3.5.x' into 4.0.x
Closes gh-49753
2026-03-25 11:24:09 +00:00
Andy Wilkinson 025b527e87 Fix WebSocketMessagingAutoConfiguration in the absence of Jackson
Previously, the absence of Jackson would result in the loss of
some configuration that does not depend on Jackson. That
configuration is:

  - the inbound and outbound channels' executors
  - the bean that forces the stompWebSocketHandlerMapping bean to be
    eager when lazy init is enabled

This commit updates the auto-configuration so that only the Jackson
message converter configuration backs off in Jackson's absence.

Fixes gh-49750
2026-03-25 10:51:01 +00:00
Stéphane Nicoll 6b53de850d Merge branch '3.5.x' into 4.0.x
Closes gh-49747
2026-03-25 07:34:12 +01:00
Stéphane Nicoll 328267249f Make DevTools tests more tolerant to wrapped DataSource
Closes gh-49745
2026-03-25 07:31:46 +01:00
Phillip Webb 4157578985 Merge pull request #49741 from quaff
* pr/49741:
  Remove empty package "org.springframework.boot.actuate.data"

Closes gh-49741
2026-03-24 19:03:14 -07:00
Yanming Zhou 664467563b Remove empty package "org.springframework.boot.actuate.data"
See gh-49741

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2026-03-24 19:02:20 -07:00
Phillip Webb 9e4adc21e0 Merge branch '3.5.x' into 4.0.x
Closes gh-49738
2026-03-24 18:11:56 -07:00
Phillip Webb d44683180d Support constructor binding method-level @NestedConfigurationProperty
Update `spring-boot-configuration-processor` to support method-level
`@NestedConfigurationProperty` annotations when constructor binding
is being used.

Fixes gh-49734
2026-03-24 18:05:02 -07:00
Phillip Webb e8ec285fd5 Merge branch '3.5.x' into 4.0.x
Closes gh-49736
2026-03-24 17:39:33 -07:00
Phillip Webb 546fc59590 Merge pull request #49735 from dlwldnjs1009
* pr/49735:
  Fix minor Javadoc wording errors

Closes gh-49735
2026-03-24 17:39:16 -07:00
Lee Jiwon add1f9763e Fix minor Javadoc wording errors
Signed-off-by: Lee Jiwon <dlwldnjs1009@gmail.com>

See gh-49735
2026-03-24 17:36:19 -07:00
Phillip Webb 4694f6fa6a Merge branch '3.5.x' into 4.0.x
Closes gh-49731
2026-03-24 13:38:12 -07:00
Phillip Webb 17e256f16b Restore correct grouping of initial ConfigDataContributors
Update `ConfigDataEnvironment` to restore previous property override
behavior by correctly grouping the initial `ConfigDataContributor`
instances.

This regression was cause by the polish commit 646db448 which attempted
to simplify the fix for gh-49324 by including all initial contributors
in a single contributor node. This change inadvertently changed the
iteration order for the `spring.config.location` and
`spring.config.additional-location` properties which still need to
be expanded and added in reverse order.

Fixes gh-49724
2026-03-24 13:31:52 -07:00
Stéphane Nicoll a96bfd6a0b Merge branch '3.5.x' into 4.0.x
Closes gh-49727
2026-03-24 10:29:30 +01:00
Stéphane Nicoll 485662e063 Merge pull request #49723 from dlwldnjs1009
* jiwon/fix-incorrect-articles:
  Fix incorrect indefinite articles in Javadoc

Closes gh-49723
2026-03-24 10:29:02 +01:00
Lee Jiwon 5a836da339 Fix incorrect indefinite articles in Javadoc
See gh-49723

Signed-off-by: Lee Jiwon <dlwldnjs1009@gmail.com>
2026-03-24 10:25:46 +01:00
Stéphane Nicoll 1df48399f3 Merge branch '3.5.x' into 4.0.x
Closes gh-49725
2026-03-24 10:24:07 +01:00
Stéphane Nicoll 5618f133c5 Merge pull request #49718 from dependabot[bot]
* dependabot/github_actions/jfrog/setup-jfrog-cli-4.10.0:
  Polish "Bump jfrog/setup-jfrog-cli from 4.9.1 to 4.10.0"
  Bump jfrog/setup-jfrog-cli from 4.9.1 to 4.10.0

Closes gh-49718
2026-03-24 10:23:20 +01:00
Stéphane Nicoll 06b006aaa5 Polish "Bump jfrog/setup-jfrog-cli from 4.9.1 to 4.10.0"
See gh-49718
2026-03-24 10:10:54 +01:00
dependabot[bot] a8640c8272 Bump jfrog/setup-jfrog-cli from 4.9.1 to 4.10.0
Bumps [jfrog/setup-jfrog-cli](https://github.com/jfrog/setup-jfrog-cli) from 4.9.1 to 4.10.0.
- [Release notes](https://github.com/jfrog/setup-jfrog-cli/releases)
- [Commits](https://github.com/jfrog/setup-jfrog-cli/compare/279b1f629f43dd5bc658d8361ac4802a7ef8d2d5...86dacb6974c66cc99e7651e1205f6581aaddba9a)

---
updated-dependencies:
- dependency-name: jfrog/setup-jfrog-cli
  dependency-version: 4.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

See gh-49718

Signed-off-by: dependabot[bot] <support@github.com>
2026-03-24 10:09:44 +01:00
Stéphane Nicoll bcd5b28da3 Merge branch '3.5.x' into 4.0.x
Closes gh-49714
2026-03-23 16:27:16 +01:00
Stéphane Nicoll 7624cbb924 Merge pull request #49710 from deejay1
* kotlin-examples-redux:
  Polish "Add some more Kotlin examples and trivial style fixes"
  Add some more Kotlin examples and trivial style fixes

Closes gh-49710
2026-03-23 16:23:34 +01:00
Stéphane Nicoll e15755bc80 Polish "Add some more Kotlin examples and trivial style fixes"
See gh-49710
2026-03-23 16:23:20 +01:00
Łukasz Jernaś d7078e08b8 Add some more Kotlin examples and trivial style fixes
See gh-49710

Signed-off-by: Łukasz Jernaś <lukasz.jernas@allegro.com>
2026-03-23 16:23:20 +01:00
Andy Wilkinson 3e4eb6713f Merge branch '3.5.x' into 4.0.x
Closes gh-49712
2026-03-23 15:19:38 +00:00
Andy Wilkinson fda3a0d8ba Fix capitalization of comment prefix for upgrade attention issues
Closes gh-49711
2026-03-23 15:18:54 +00:00
Andy Wilkinson 8e09e6a5ee Merge branch '3.5.x' into 4.0.x 2026-03-23 15:11:45 +00:00
Andy Wilkinson 94536b0428 Upgrade to Jackson 2.21.2
The Jackson team have ended support for Jackson 2.19.x (and 2.20.x).
In response to this, this commit upgrades to Jackson 2.21.2. 2.21.x
is designated as an LTS release so future minor upgrades should not
be necessary.

Closes gh-49365
2026-03-23 14:51:16 +00:00
Andy Wilkinson f988fe93e0 Merge branch '3.5.x' into 4.0.x 2026-03-23 14:50:29 +00:00
Andy Wilkinson 5cf51ba98d Relax ordering assertion when testing resource provider
Flyway's org.flywaydb.core.internal.scanner.Scanner does not make
any ordering guarantees so neither does our
NativeImageResourceProvider. It also isn't required by the contract
where a Collection is returned so we can relax the assertion in the
test so that it doesn't care about the ordering.

See gh-49661
2026-03-23 14:45:10 +00:00
Brian Clozel 86274962f4 Merge branch '3.5.x' into 4.0.x
Closes gh-49706
2026-03-23 11:18:25 +01:00
Andy Wilkinson 1e5fd25888 Overhaul Spring Session documentation following modularization
Closes gh-49704
2026-03-23 09:43:56 +00:00
Brian Clozel e65732e178 Fix Flyway sub-folders support in Native image
Prior to this commit, the native image support for scanning Flyway
migration scripts would not scan sub-folders at runtime when running a
Native image.

This commit ensures that the resource scanning at runtime also considers
sub-directories for native images.

Fixes gh-49661
2026-03-23 09:50:02 +01:00
Phillip Webb 6dcd2de370 Merge pull request #49695 from kwondh5217
* kwondh5217/main:
  Add @ConditionalOnWebApplication to NettyReactiveWebServerAutoConfiguration

Closes gh-49695
2026-03-21 14:28:04 -07:00
Daeho Kwon 0b45618cb5 Add @ConditionalOnWebApplication to NettyReactiveWebServerAutoConfiguration
See gh-49695

Signed-off-by: Daeho Kwon <trewq231@naver.com>
2026-03-21 14:26:23 -07:00
Phillip Webb e464348fa4 Merge branch '3.5.x' into 4.0.x
Closes gh-49697
2026-03-21 14:22:46 -07:00
Phillip Webb 10df287bbb Merge pull request #49694 from dlwldnjs1009
* jiwon/fix-standard-stack-trace-printer-javadoc:
  Fix typos in StandardStackTracePrinter Javadoc

Closes gh-49694
2026-03-21 14:22:08 -07:00
Lee Jiwon ec167252f2 Fix typos in StandardStackTracePrinter Javadoc
See gh-49694

Signed-off-by: Lee Jiwon <dlwldnjs1009@gmail.com>
2026-03-21 14:18:43 -07:00
Andy Wilkinson 6814f6577a Merge branch '3.5.x' into 4.0.x
Closes gh-49683
2026-03-20 13:03:50 +00:00