Commit Graph
62395 Commits
Author SHA1 Message Date
Stéphane Nicoll dd378bcc6e Merge branch '4.0.x' into 4.1.x 2026-10-05 17:41:04 +02:00
Stéphane Nicoll e732f6a0cb Start building against Spring Data Bom 2025.1.8 snapshots
See gh-51955
2026-10-05 17:25:56 +02:00
Stéphane Nicoll 8e26658e4a Start building against Spring WS 5.0.3 snapshots
See gh-51954
2026-10-05 17:20:19 +02:00
Stéphane Nicoll 6c61d5772d Start building against Spring RESTDocs 4.0.2 snapshots
See gh-51953
2026-10-05 17:20:19 +02:00
Stéphane Nicoll b4a61d0fc5 Start building against Spring Kafka 4.0.8 snapshots
See gh-51952
2026-10-05 17:20:19 +02:00
Stéphane Nicoll 2c10a0a9dd Start building against Spring Framework 7.0.10 snapshots
See gh-51951
2026-10-05 17:20:19 +02:00
Stéphane Nicoll 0920e36db9 Start building against Spring AMQP 4.0.6 snapshots
See gh-51950
2026-10-05 17:20:19 +02:00
Andy Wilkinson 85fcb5db74 Merge branch '4.0.x' into 4.1.x
Closes gh-51946
2026-10-05 10:18:30 +01:00
Andy Wilkinson 4a42493675 Use --release-train as source of release date
When the milestone is unscheduled, use the configured release train as
a source of the release date. This allows moveToSnapshots to be used
before joining the train, when the milestone is typically unscheduled.

Fixes gh-51942
2026-10-05 10:18:16 +01:00
Stéphane Nicoll d83b8fafaa Merge branch '4.0.x' into 4.1.x
Closes gh-51944
2026-10-05 10:50:57 +02:00
Stéphane Nicoll 511bbc03d9 Apply release train infrastructure
This commit moves our previous release process using dedicated workflows
to the use of the release orchestrator. The necessary workflows have
been added in this commit as well as the two goals required to build
and test the release.

Post-release actions have been moved to a publicize-release workflow.

Closes gh-51883
2026-10-05 10:48:15 +02:00
Andy Wilkinson 1958b39214 Use new isEnabled methods when testing CBOR and XML feature config
Closes gh-47774
2026-10-02 17:59:02 +01:00
Andy Wilkinson f67ec6b3ca Merge branch '4.0.x' into 4.1.x 2026-10-01 12:30:09 +01:00
Andy Wilkinson 1d9b5d5a66 Polish 2026-10-01 12:30:00 +01:00
Andy Wilkinson 721f93fb6e Merge branch '4.0.x' into 4.1.x
Closes gh-51925
2026-10-01 12:04:25 +01:00
Andy Wilkinson 47d4b22282 Merge pull request #50489 from galenzo17
Closes gh-50489

* gh-50489:
  Polish "Preserve property descriptions during Gradle incremental compilation"
  Preserve property descriptions during Gradle incremental compilation
2026-10-01 12:04:18 +01:00
Andy Wilkinson 8c457932e7 Polish "Preserve property descriptions during Gradle incremental compilation"
See gh-50489

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-10-01 12:02:46 +01:00
Agustin Bereciartua f135b3fb88 Preserve property descriptions during Gradle incremental compilation
Cache descriptions in a location outside CLASS_OUTPUT so that Gradle's
incremental compilation does not lose javadoc-based descriptions for
types passed as .class files.

See gh-50489

Signed-off-by: Agustin Bereciartua <bereciartua.agustin@gmail.com>
2026-10-01 11:54:46 +01:00
Andy Wilkinson 267707e2bc Merge branch '4.0.x' into 4.1.x
Closes gh-51924
2026-10-01 11:20:14 +01:00
Andy Wilkinson 01afdc8dc7 Merge pull request #51893 from scottfrederick
Closes gh-51893

* gh-51893:
  Check distro instead of stack ID for run image
2026-10-01 11:20:03 +01:00
Scott FrederickandMoritz Halbritter b46fe745c0 Check distro instead of stack ID for run image
Stack IDs are deprecated since Platform API 0.12 in favor of target
data. Comparing them produced false warnings for valid combinations,
e.g. the default builder with its tiny run image ('resolute' vs
'resolute.tiny').

Compare the OS distribution instead, read from the
io.buildpacks.base.distro.* labels with a fallback to the
io.buildpacks.stack.distro.* labels set by Paketo images. A missing
name or version matches any value, as in the lifecycle.

Co-authored-by: Moritz Halbritter <moritz.halbritter@broadcom.com>
Signed-off-by: Scott Frederick <scottyfred@gmail.com>

See gh-51893
2026-10-01 11:19:48 +01:00
Moritz Halbritter d08663b9e8 Merge branch '4.0.x' into 4.1.x
Closes gh-51920
2026-10-01 12:13:53 +02:00
Moritz Halbritter 56facf449c Upgrade to Maven 3.10.0
Closes gh-51911
2026-10-01 12:13:12 +02:00
Andy Wilkinson f544cecb5a Merge branch '4.0.x' into 4.1.x
Closes gh-51918
2026-10-01 11:02:58 +01:00
Andy Wilkinson c15bda5b50 Update Antora dependencies
Closes gh-51917
2026-10-01 11:02:37 +01:00
Andy Wilkinson 6236f43194 Merge branch '4.0.x' into 4.1.x
Closes gh-51915
2026-10-01 10:48:27 +01:00
Andy Wilkinson 4deb6fabec Merge pull request #51901 from dependabot[bot]
Closes gh-51901

* gh-51901:
  Bump Homebrew/actions/setup-homebrew from 2026.09.21.1 to 2026.09.28.1
2026-10-01 10:48:21 +01:00
dependabot[bot] db370c5dd1 Bump Homebrew/actions/setup-homebrew from 2026.09.21.1 to 2026.09.28.1
Bumps [Homebrew/actions/setup-homebrew](https://github.com/homebrew/actions) from 2026.09.21.1 to 2026.09.28.1.
- [Release notes](https://github.com/homebrew/actions/releases)
- [Changelog](https://github.com/Homebrew/actions/blob/main/release.test.mts)
- [Commits](https://github.com/homebrew/actions/compare/848c272c7bfe984a197bd4d16383f4c106ec61e6...e99025eb970cfa124b8284a35463d87426917478)

---
updated-dependencies:
- dependency-name: Homebrew/actions/setup-homebrew
  dependency-version: 2026.09.28.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

See gh-51901
2026-10-01 10:47:34 +01:00
Andy Wilkinson 30d0204752 Merge branch '4.0.x' into 4.1.x
Closes gh-51912
2026-10-01 10:45:26 +01:00
Andy Wilkinson 80151a20a1 Merge pull request #51900 from dependabot[bot]
Closes gh-51900

* gh-51900:
  Bump spring-io/artifactory-deploy-action from 0.0.5 to 0.0.6
2026-10-01 10:45:10 +01:00
dependabot[bot] e131061576 Bump spring-io/artifactory-deploy-action from 0.0.5 to 0.0.6
Bumps [spring-io/artifactory-deploy-action](https://github.com/spring-io/artifactory-deploy-action) from 0.0.5 to 0.0.6.
- [Release notes](https://github.com/spring-io/artifactory-deploy-action/releases)
- [Commits](https://github.com/spring-io/artifactory-deploy-action/compare/aba148f1541e09adcf5735af90029fac9a6d3083...9cb1c7df78cd8d1223de1dde974819fa6378af9f)

---
updated-dependencies:
- dependency-name: spring-io/artifactory-deploy-action
  dependency-version: 0.0.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

See gh-51900
2026-10-01 10:44:17 +01:00
Andy Wilkinson 07cdeb9051 Merge branch '4.0.x' into 4.1.x 2026-10-01 10:20:56 +01:00
Andy Wilkinson 8c8923f338 Use release version of Gradle 9.8.0 for CI with Java 27
See gh-51423
2026-10-01 10:20:14 +01:00
Andy Wilkinson 616e64b4ae Merge branch '4.0.x' into 4.1.x
Closes gh-51908
2026-10-01 09:52:47 +01:00
Andy Wilkinson f6aa92821d Fix BasicJsonParser's escape handling in nested elements
BasicJsonParser tokenizes JSON into map entries (key-value pairs)
and list entries (values). As part of this, any escaped characters
are unescaped. When the values are themselves maps or lists, they
are tokenized again. This multi-pass approach with every pass
performing unescaping causes the escaped characters to be handled
incorrectly.

This commit updates BasicJsonParser to leave escape characters in
place when its parsing characters nested within a list or map. The
escaping is now only considered when parsing a scalar value. This
ensures that unescaping is only performed once.

Fixes gh-51907
2026-10-01 09:08:42 +01:00
Phillip Webb a5bc294685 Merge branch '4.0.x' into 4.1.x
Closes gh-51897
2026-09-28 14:20:12 -07:00
Phillip Webb 73672ff141 Merge pull request #51896 from ngocnhan-tran1996
Closes gh-51896

* pr/51896:
  Polish 'Use instanceof pattern matching to avoid an explicit cast'
  Use instanceof pattern matching to avoid an explicit cast
2026-09-28 14:19:52 -07:00
Phillip Webb 7a871ff117 Polish 'Use instanceof pattern matching to avoid an explicit cast'
See gh-51896
2026-09-28 14:18:55 -07:00
Tran Ngoc Nhan 68c321499a Use instanceof pattern matching to avoid an explicit cast
See gh-51896

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-09-28 14:18:41 -07:00
Phillip Webb 80a2d49953 Merge branch '4.0.x' into 4.1.x
Closes gh-51894
2026-09-28 09:18:06 -07:00
Phillip Webb e4b2ecf934 Merge pull request #51892 from LindseyZ1205
Closes gh-51892

* pr/51892:
  Polish 'Fix formatting a zero period with a weeks unit'
  Fix formatting a zero period with a weeks unit
2026-09-28 09:14:44 -07:00
Phillip Webb d9df34b827 Polish 'Fix formatting a zero period with a weeks unit'
See gh-51892
2026-09-28 07:54:19 -07:00
Yingzi Zhang b21366db6d Fix formatting a zero period with a weeks unit
See gh-51892

Signed-off-by: Yingzi Zhang <yingzizhang1205@gmail.com>
2026-09-28 07:53:16 -07:00
Stéphane Nicoll 3af085d914 Merge branch '4.0.x' into 4.1.x
Closes gh-51890
2026-09-28 13:16:33 +02:00
Stéphane Nicoll 9e93588936 Merge pull request #51872 from ksky8864
Closes gh-51872

* devtools-missing-jdbc-r2dbc:
  Polish contribution
  Back off DevTools' JDBC and R2DBC support when modules are missing
2026-09-28 13:16:26 +02:00
Stéphane Nicoll e3805a9601 Polish contribution
See gh-51872
2026-09-28 13:08:02 +02:00
Kosuke Yanagihara f0987da4bb Back off DevTools' JDBC and R2DBC support when modules are missing
DevToolsDataSourceAutoConfiguration and DevToolsR2dbcAutoConfiguration
were only guarded by classes from the JDK and r2dbc-spi respectively.
When a single user-defined DataSource or ConnectionFactory bean was
present, their conditions went on to reference classes from
spring-boot-jdbc or spring-boot-r2dbc. Both are optional dependencies
of spring-boot-devtools, so startup failed with a NoClassDefFoundError
when they were absent.

This commit adds a class from each module to the class conditions.
Without the modules the conditions could never match, so this only
turns the failure into a back-off.

See gh-51872

Signed-off-by: Kosuke Yanagihara <11373191+ksky8864@users.noreply.github.com>
2026-09-28 12:44:47 +02:00
Stéphane Nicoll 708a58c2cf Merge branch '4.0.x' into 4.1.x
Closes gh-51888
2026-09-28 12:42:30 +02:00
Stéphane Nicoll 8c7c372dcb Merge pull request #51870 from ohchanKyu
Closes gh-51870

* fix-mariadb-allow-empty-root-password-env:
  Recognize MARIADB_ALLOW_EMPTY_ROOT_PASSWORD in Docker Compose support
2026-09-28 12:42:25 +02:00
ohchanKyu 5e2730eb01 Recognize MARIADB_ALLOW_EMPTY_ROOT_PASSWORD in Docker Compose support
MariaDbEnvironment checked for MARIADB_ALLOW_EMPTY_PASSWORD, which the
official MariaDB image does not support. The documented variable is
MARIADB_ALLOW_EMPTY_ROOT_PASSWORD. As a result, a compose service that
used the documented variable started fine but Spring Boot failed with
"No MariaDB password found".

See gh-51870

Signed-off-by: ohchanKyu <okc0202@naver.com>
2026-09-28 12:41:32 +02:00