spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-20 06:29:16 +00:00
Code Issues Projects Releases Wiki Activity
60,441 Commits 26 Branches 394 Tags
da3fd5cf53ed39eb90bb09fb01fd2b4591bb7880
Commit Graph
60441 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb da3fd5cf53 Merge branch '4.0.x' 
Closes gh-49732
 2026-03-24 13:43:06 -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 fe8fcaeaff Polish 2026-03-24 11:28:37 +01:00
Stéphane Nicoll bf5562359d Polish configuration properties for gRPC support 
This commit aligns convention for configuration properties description:

- Do not start with 'The' or 'A'.
- Do not document default value when it is specified.
- Document default change to unit
 2026-03-24 11:13:19 +01:00
Stéphane Nicoll 5b7a6a9cc6 Consistently document default duration unit in gRPC support 
Closes gh-49722
 2026-03-24 10:48:43 +01:00
Stéphane Nicoll 3a38f0039b Merge branch '4.0.x' 
Closes gh-49728
 2026-03-24 10:29:45 +01: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 1ce6c5405f Merge branch '4.0.x' 
Closes gh-49726
 2026-03-24 10:24:16 +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 a93ad0f173 Merge branch '4.0.x' 
Closes gh-49715
 2026-03-23 16:27:35 +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 59bcfbdb51 Merge branch '4.0.x' 
Closes gh-49713
 2026-03-23 15:19:47 +00: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 d6d7ffaf17 Merge branch '4.0.x' 2026-03-23 15:11: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 6700a87438 Merge branch '4.0.x' 2026-03-23 14:50:42 +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 d10f1b8399 Merge branch '4.0.x' 
Closes gh-49707
 2026-03-23 11:19:02 +01: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 e8fe9166bf Merge branch '4.0.x' 
Closes gh-49705
 2026-03-23 09:44:29 +00: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
Stéphane Nicoll c5cb7c43a9 Merge pull request #49700 from dlwldnjs1009 
* jiwon/fix-external-config-typos:
  Fix duplicated words in external-config documentation

Closes gh-49700
 2026-03-22 10:15:30 +01:00
Lee Jiwon d804749c2e Fix duplicated words in external-config documentation 
See gh-49700

Signed-off-by: Lee Jiwon <dlwldnjs1009@gmail.com>
 2026-03-22 10:14:56 +01:00
Phillip Webb 732b8f3931 Merge branch '4.0.x' 
Closes gh-49699
 2026-03-21 14:28:14 -07: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 eff95e98a5 Merge branch '4.0.x' 
Closes gh-49698
 2026-03-21 14:23:13 -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 b26fe83e0d Merge branch '4.0.x' 
Closes gh-49684
 2026-03-20 13:04:00 +00:00
Andy Wilkinson 6814f6577a Merge branch '3.5.x' into 4.0.x 
Closes gh-49683
 2026-03-20 13:03:50 +00:00
Andy Wilkinson f0a02cdbd3 Trigger docs build once release has been promoted 
Closes gh-49682
 2026-03-20 13:01:43 +00:00
Andy Wilkinson a9ea737f85 Merge branch '4.0.x' 
Closes gh-49681
 2026-03-20 12:51:41 +00:00
Andy Wilkinson fd5ac05daf Merge branch '3.5.x' into 4.0.x 
Closes gh-49680
 2026-03-20 12:51:28 +00:00
Andy Wilkinson aec36b88ef Upgrade to Antora UI 0.4.26 
Closes gh-49679
 2026-03-20 12:50:35 +00:00
Stéphane Nicoll d57a81c766 Revert AMQP 1.0 support 
Closes gh-49676
 2026-03-20 11:11:27 +01:00