Commit Graph
60488 Commits
Author SHA1 Message Date
Andy Wilkinson c7e7a19c5d Upgrade to ActiveMQ 6.2.2
Closes gh-49768
2026-03-25 13:37:19 +00:00
Stéphane Nicoll 3b897b2f7a Merge branch '4.0.x'
Closes gh-49783
2026-03-25 14:26:52 +01:00
Stéphane Nicoll 51ffdc6cd3 Merge branch '3.5.x' into 4.0.x
Closes gh-49782
2026-03-25 14:26:27 +01:00
Stéphane Nicoll 696a60e8fd Full auto-configure transaction management in slice tests
Closes gh-49716
2026-03-25 14:11:14 +01:00
Andy Wilkinson 11aaf8d293 Merge branch '4.0.x' 2026-03-25 12:44:29 +00:00
Andy Wilkinson ba70d41a99 Upgrade to Tomcat 11.0.20
Closes gh-49767
2026-03-25 12:30:13 +00:00
Andy Wilkinson fd94ca0a0b Upgrade to Netty 4.2.11.Final
Closes gh-49766
2026-03-25 12:30:09 +00:00
Andy Wilkinson 7e6833bc9c Upgrade to jOOQ 3.19.31
Closes gh-49765
2026-03-25 12:30:05 +00:00
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 2ce52d9961 Merge branch '4.0.x' 2026-03-25 12:28:04 +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 89aa8db95c Merge branch '4.0.x'
Closes gh-49755
2026-03-25 11:59:07 +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 28d12f29bb Merge branch '4.0.x'
Closes gh-49754
2026-03-25 11:24:33 +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
Brian Clozel dba19c73c7 Polishing contribution
See gh-49744

Signed-off-by: Brian Clozel <brian.clozel@broadcom.com>
2026-03-25 11:12:35 +01:00
LeeJiWon fc58d9e9d9 Reuse reactive CloudFoundry UAA URL across calls
Reactive SecurityService#getUaaUrl() creates a new Mono on each
invocation, so the resolved UAA URL is not reused across calls. During
token validation, this can lead to duplicate /info requests when token
keys are fetched and the issuer is validated in the same flow.

Cache the resolved UAA URL after a successful lookup and add regression
tests that verify reuse after success and retry after failure.

Signed-off-by: LeeJiWon <dlwldnjs1009@gmail.com>
2026-03-25 11:10:26 +01:00
Stéphane Nicoll 3898a88eef Merge pull request #49730 from therepanic
* apply-keepalive-settings:
  Polish "Add server-side support for custom gRPC conventions"
  Add server-side support for custom gRPC conventions

Closes gh-49730
2026-03-25 10:54:42 +01:00
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