Commit Graph
60461 Commits
Author SHA1 Message Date
Stéphane Nicoll 3ebc8653d5 Polish "Add server-side support for custom gRPC conventions"
See gh-49730
2026-03-25 10:47:41 +01:00
Andrey Litvitski 7c268112a1 Add server-side support for custom gRPC conventions
In this commit, we make `GrpcServerObservationAutoConfiguration` and
`GrpcClientObservationAutoConfiguration` consistent by supporting a
custom `GrpcClientObservationConvention` and adding the
`@ConditionalOnMissingBean` annotation to the
`observationGrpcServerInterceptor` bean.

See gh-49730

Signed-off-by: Andrey Litvitski <andrey1010102008@gmail.com>
2026-03-25 10:40:49 +01:00
Stéphane Nicoll d413cc93ec Merge branch '4.0.x'
Closes gh-49748
2026-03-25 07:34:24 +01: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 035d3394f7 Merge pull request #49740 from quaff
* pr/49740:
  Fix nullable declaration in EntityManagerFactoryBuilder

Closes gh-49740
2026-03-24 19:05:38 -07:00
Yanming Zhou 6c5b3a06ec Fix nullable declaration in EntityManagerFactoryBuilder
See gh-49740

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2026-03-24 19:05:01 -07:00
Phillip Webb b4c2649820 Merge branch '4.0.x'
Closes gh-49742
2026-03-24 19:03:22 -07: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 b06ee6e423 Merge branch '4.0.x'
Closes gh-49739
2026-03-24 18:12:08 -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 9bac152770 Merge branch '4.0.x'
Closes gh-49737
2026-03-24 17:39:47 -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 91f4bc9455 Add 'spring.jpa.bootstrap' property
Add a `spring.jpa.bootstrap` property that can be set to `async`
to switch on background bootstrapping in classic JPA setup.

Closes gh-49733
2026-03-24 16:45:11 -07:00
Phillip Webb e76c6c5488 Refine Spring Data JPA background bootstrapping mode support
Update `spring.data.jpa.repositories.bootstrap-mode` logic
so that:

- A value of `lazy` no longer sets a bootstrap executor.

- A value of `deferred` requires that a bootstrap executor is
  ultimately set, and fails with a meaningful message if it is
  not.

The logic used to find the AsyncTaskExecutor has now moved to
the `JpaBaseConfiguration` and is triggered by the
`EntityManagerFactoryBuilder` only when background
bootstrapping is required.

Closes gh-49688
2026-03-24 16:43:59 -07:00
Phillip Webb d3b6fa73ad Polish EntityManagerFactoryBuilder 2026-03-24 16:43:09 -07:00
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