Commit Graph
59210 Commits
Author SHA1 Message Date
Moritz Halbritter dd778e52e1 Merge branch '3.5.x' into 4.0.x
Closes gh-48904
2026-01-20 13:38:18 +01:00
Moritz Halbritter 2fa3aaaf9f Merge pull request #48902 from dependabot[bot]
* pr/48902:
  Polish "Bump jfrog/setup-jfrog-cli from 4.8.1 to 4.9.1"
  Bump jfrog/setup-jfrog-cli from 4.8.1 to 4.9.1

Closes gh-48902
2026-01-20 13:37:43 +01:00
Moritz Halbritter 37e0cbc371 Polish "Bump jfrog/setup-jfrog-cli from 4.8.1 to 4.9.1"
See gh-48902
2026-01-20 13:37:15 +01:00
dependabot[bot] ad51defa29 Bump jfrog/setup-jfrog-cli from 4.8.1 to 4.9.1
Bumps [jfrog/setup-jfrog-cli](https://github.com/jfrog/setup-jfrog-cli) from 4.8.1 to 4.9.1.
- [Release notes](https://github.com/jfrog/setup-jfrog-cli/releases)
- [Commits](https://github.com/jfrog/setup-jfrog-cli/compare/5b06f730cc5a6f55d78b30753f8583454b08c0aa...279b1f629f43dd5bc658d8361ac4802a7ef8d2d5)

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

See gh-48902

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-20 13:36:34 +01:00
Andy Wilkinson c048f5d618 Merge pull request #48900 from izeye
* gh-48900:
  Remove @ConditionalOnClass(Sniffer.class) on RestClientSnifferConfiguration

Closes gh-48900
2026-01-20 10:02:08 +00:00
Johnny Lim 485b16ad0a Remove @ConditionalOnClass(Sniffer.class) on RestClientSnifferConfiguration
The condition is unnecessary as the sniifer is now included in the
same jar as the REST client itself.

See gh-48900

Signed-off-by: Johnny Lim <izeye@naver.com>
2026-01-20 09:59:59 +00:00
Andy Wilkinson 85f3f3856d Revert "Allow a custom JsonFactory to be used with JsonMapper.Builder"
This reverts commit 22d6f6a7de.

See gh-48594
2026-01-20 09:34:39 +00:00
Andy Wilkinson 6df1caf8f9 Auto-configure transactions when using spring-boot-kafka
spring-kafka has an api dependency on spring-tx, placing
the latter on the compile classpath of the former's consumers.
Additionally, when spring.kafka.producer.transaction-id-prefix is
set, the Kafka auto-configuration will define a Kafka-based
transaction manager. However, the transaction manager won't be used
without some configuration from the user as there's no dependency on
spring-boot-transaction and, therefore, no auto-configuration of
@EnableTransactionManagement.

This commit adds a spring-boot-transaction dependency to
spring-boot-kafka, aligning it with the spring-tx dependency that
spring-kafka already has.

Fixes gh-48880
2026-01-19 10:23:12 +00:00
Andy Wilkinson 9e374fe3fc Upgrade to XML Maven Plugin 1.2.1
Closes gh-48887
2026-01-19 09:04:58 +00:00
Andy Wilkinson 7312e01446 Upgrade to Postgresql 42.7.9
Closes gh-48886
2026-01-19 09:04:54 +00:00
Andy Wilkinson 7877c206f7 Upgrade to Logback 1.5.25
Closes gh-48885
2026-01-19 09:04:50 +00:00
Andy Wilkinson f923ea6a49 Merge branch '3.5.x' into 4.0.x 2026-01-19 09:00:36 +00:00
Andy Wilkinson b1e9718561 Upgrade to REST Assured 5.5.7
Closes gh-48884
2026-01-19 08:46:25 +00:00
Andy Wilkinson f1f1747dd0 Upgrade to Postgresql 42.7.9
Closes gh-48883
2026-01-19 08:46:20 +00:00
Andy Wilkinson d767d60cf3 Upgrade to Logback 1.5.25
Closes gh-48882
2026-01-19 08:46:16 +00:00
Andy Wilkinson 098259ead1 Upgrade to Hibernate 6.6.41.Final
Closes gh-48881
2026-01-19 08:46:11 +00:00
Stéphane Nicoll db758bd404 Merge pull request #48875 from Zuohuang-Cai
* pr/48875:
  Polish "Upgrade gradle to 9.3.0"
  Upgrade gradle to 9.3.0

Closes gh-48875
2026-01-18 08:54:16 +01:00
Stéphane Nicoll 2b176765e5 Polish "Upgrade gradle to 9.3.0"
See gh-48875
2026-01-18 08:50:03 +01:00
Zuohuang Cai e10320a0d8 Upgrade gradle to 9.3.0
See gh-48875

Signed-off-by: Zuohuang Cai <zc26226@gmail.com>
2026-01-18 08:49:43 +01:00
Stéphane Nicoll 671e7c573b Merge pull request #48874 from ngocnhan-tran1996
* pr/48874:
  Remove duplicate word

Closes gh-48874
2026-01-17 20:19:23 +01:00
Tran Ngoc Nhan 7c03d3ad07 Remove duplicate word
See gh-48874

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-01-17 20:10:28 +01:00
Andy Wilkinson e579b8be98 Upgrade to Spring Data Bom 2025.1.2
Closes gh-48716
2026-01-16 16:09:39 +00:00
Andy Wilkinson 6ce5cae7a6 Merge branch '3.5.x' into 4.0.x 2026-01-16 16:08:50 +00:00
Andy Wilkinson 30bfdac357 Upgrade to Spring Data Bom 2025.0.8
Closes gh-48708
2026-01-16 16:08:27 +00:00
Andy Wilkinson 9c3c008f50 Merge branch '3.5.x' into 4.0.x
Closes gh-48866
2026-01-16 14:55:24 +00:00
Andy Wilkinson aaf482dfd4 Automate inclusion of noteworthy changes in the changelog
Closes gh-48656
2026-01-16 14:54:55 +00:00
Andy Wilkinson 9aa4965823 Merge branch '3.5.x' into 4.0.x 2026-01-16 08:53:14 +00:00
Andy Wilkinson e5fd82855a Upgrade to Undertow 2.3.21.Final
Closes gh-48848
2026-01-16 07:33:21 +00:00
Andy Wilkinson 7bd53c7ba2 Upgrade to R2DBC MSSQL 1.0.4.RELEASE
Closes gh-48847
2026-01-16 07:32:09 +00:00
Andy Wilkinson 3ea6db0a56 Upgrade to Micrometer Tracing 1.5.8
Closes gh-48706
2026-01-16 07:32:09 +00:00
Andy Wilkinson 8152bd0292 Upgrade to Micrometer 1.15.8
Closes gh-48705
2026-01-16 07:32:09 +00:00
Phillip Webb ea564d21e0 Ensure that the session same site defaults to "lax"
Remove the `always()` call from the same site mapping and replace `as`
with a direct call. This update means that mapping only occurs when
`getSameSite` is not `null`, but mapping can still be applied if
`sameSite.getAttributeValue()` returns `null`.

Closes gh-48830
2026-01-15 17:36:56 -08:00
Phillip Webb 5d2373eab8 Merge branch '3.5.x' into 4.0.x 2026-01-15 17:33:45 -08:00
Andy Wilkinson b497bf3ea5 Test that the session same site defaults to "lax"
See gh-48830
2026-01-15 17:31:18 -08:00
Andy Wilkinson 6ba3ac3d7b Upgrade to Lettuce 6.8.2.RELEASE
Closes gh-48859
2026-01-15 17:48:38 +00:00
Andy Wilkinson 50d3381fb5 Upgrade to Spring HATEOAS 3.0.2
Closes gh-48834
2026-01-15 15:36:17 +00:00
Andy Wilkinson 5e9bd08fea Upgrade to Spring Framework 7.0.3
Closes gh-48717
2026-01-15 15:36:17 +00:00
Andy Wilkinson 0fb395ae1d Upgrade to R2DBC MSSQL 1.0.4.RELEASE
Closes gh-48858
2026-01-15 15:36:17 +00:00
Andy Wilkinson 3100599005 Upgrade to Hibernate 7.2.1.Final
Closes gh-48857
2026-01-15 15:36:17 +00:00
Andy Wilkinson 625571c3d1 Fix MVC and WebFlux validator creation in a native image
Following modularization, a presence check for ValidatorAdapter was
needed in the MVC and WebFlux auto-configuratiomn when creating
their Validators. Runtime hints to allow this check to work in a
native image were not added at the same time, resulting in the
class appearing to be absent. This caused message interpolation
for constraint violations to fail as newly created Validator was
being used which lacked the necessary MessageInterpolator
configuration.

This commit adds reflection hints for ValidatorAdapter, allowing
re-use of the context's main validator as the MVC and WebFlux
validators.

Fixes gh-48828
2026-01-15 14:12:33 +00:00
Andy Wilkinson e8cea82772 Don't require …TestAutoConfiguration classes in imports file
See gh-48822
2026-01-15 12:01:46 +00:00
Andy Wilkinson bd4c43bf53 Make s-b-restclient test autoconfigs package-private
Fixes gh-48820
2026-01-15 11:54:57 +00:00
Andy Wilkinson bd96079565 Merge pull request #48829 from mspiess
* gh-48829:
  Move schema.graphqls into test module

Closes gh-48829
2026-01-15 11:22:11 +00:00
mspiess ce20e1ed20 Move schema.graphqls into test module
Spring Projects that have the `spring.graphql.schema.locations` property
set to `"classpath*:graphql/**/"` as suggested in the documentation have
failing GraphQL tests after upgrading to Spring Boot 4.
The `Query` type definition in the books-domain schema clashes with the
schema of the application. Presumably the books-domain schema was never
meant to exist in the exported JAR file. This commit moves it into the
test module to stop it from being exported and causing problems.

Signed-off-by: mspiess <30656914+mspiess@users.noreply.github.com>

See gh-48829
2026-01-15 11:20:54 +00:00
Andy Wilkinson 8b3ef3b28b Merge branch '3.5.x' into 4.0.x
Closes gh-48840
2026-01-15 11:10:52 +00:00
Andy Wilkinson 73bf5f3d20 Avoid querying BeanFactory for beans of type ResolvableType.NONE
ResolvableType.NONE represents a type that does not exist and,
therefore could not be loaded. A bean of such a type cannot be
present in the BeanFactory so querying it for beans of that type
is pointless.

This commit updates OnBeanCondition to return immediately rather
than querying the BeanFactory by type for beans that we know cannot
be present.

Fixes gh-48836
2026-01-15 11:08:59 +00:00
Andy Wilkinson 774dd9e1de Merge branch '3.5.x' into 4.0.x
Closes gh-48838
2026-01-15 10:50:08 +00:00
Andy Wilkinson 2dabe09363 Avoid losing type information in on bean condition messages
Previously, a type in a bean condition was handled as a
ResolvableType. When the type was not present on the classpath
it would be represented as ResolvableType.NONE which renders as ?.
This resulted in some type information being omitted from the
condition evaluation report.

This commit introduces a pair, ByteType, the holds both the name of
the type as a String as well as the ResolvableType that represents
it. When that ResolvableType is NONE, the String name of the type
is used thereby avoiding the information loss.

Fixes gh-48835
2026-01-15 10:33:31 +00:00
Andy Wilkinson a5ca146aa0 Start building against Spring HATEOAS 3.0.2 snapshots
See gh-48834
2026-01-15 09:43:03 +00:00
Andy Wilkinson 574296487a Start building against Spring Integration 7.0.2 snapshots
See gh-48833
2026-01-15 09:18:44 +00:00