Commit Graph
60294 Commits
Author SHA1 Message Date
Andy Wilkinson 4f6e3e84e8 Merge branch '3.4.x' into 3.5.x 2025-11-13 10:43:36 +00:00
Andy Wilkinson b86cdd7719 Polish 2025-11-13 10:43:17 +00:00
Andy Wilkinson 9cc18130e6 Merge branch '3.5.x'
Closes gh-48110
2025-11-13 10:19:47 +00:00
Andy Wilkinson eed7f75f9e Merge branch '3.4.x' into 3.5.x
Closes gh-48107
2025-11-13 10:17:47 +00:00
Andy Wilkinson b09b0296c3 Check aggregated property metadata
Closes gh-47972
2025-11-13 10:16:38 +00:00
Stéphane Nicoll e89bb1f62f Merge branch '3.5.x'
Closes gh-48109
2025-11-13 10:56:04 +01:00
Stéphane Nicoll b543ab81f1 Merge branch '3.4.x' into 3.5.x
Closes gh-48108
2025-11-13 10:54:05 +01:00
Stéphane Nicoll fc826218b4 Merge pull request #48100 from nosan
* pr/48100:
  Use ObjectNode for building ImagePlatform JSON

Closes gh-48100
2025-11-13 10:53:55 +01:00
Dmytro Nosan d251b99615 Use ObjectNode for building ImagePlatform JSON
See gh-48100

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>

Closes gh-48100
2025-11-13 10:53:41 +01:00
Stéphane Nicoll d1e5fe3248 Merge branch '3.5.x'
Closes gh-48106
2025-11-13 10:31:25 +01:00
Stéphane Nicoll 1ce1b7ee35 Merge branch '3.4.x' into 3.5.x
Closes gh-48105
2025-11-13 10:27:51 +01:00
Stéphane NicollandCatiaCorreia catia.correia97@gmail.com 9e656c1554 Remove unnecessary field initialization
Closes gh-45168

Co-authored-by: CatiaCorreia catia.correia97@gmail.com
2025-11-13 10:21:05 +01:00
Phillip Webb 55c3f03144 Merge branch '3.5.x'
Closes gh-48103
2025-11-12 20:44:55 -08:00
Phillip Webb d1dc9579eb Merge branch '3.4.x' into 3.5.x
Closes gh-48102
2025-11-12 20:05:58 -08:00
Phillip Webb 9b387cbe77 Support recent Docker installs by raising the API version when possible
Update `DockerApi` so that the URL uses version `v1.50` whenever
possible. Prior to this commit, `v1.24` was often used which breaks
recent Docker installs due to the dropping of API version v1.43 and
below.

If the actual API version running is less than `v1.50`, but greater
than the minimum required for the API call, it will be used instead.
This hopefully means that older versions of Docker will continue to
work as they did previously.

Fixes gh-48050
2025-11-12 19:57:36 -08:00
Phillip Webb a25bcfc610 Merge branch '3.5.x'
Closes gh-48099
2025-11-12 14:22:17 -08:00
Phillip Webb 25a5d4343e Merge branch '3.4.x' into 3.5.x
Closes gh-48098
2025-11-12 13:44:02 -08:00
Phillip Webb b6460eaf67 Merge pull request #47292 from hojooo
* pr/47292:
  Polish 'Correctly handle platform specific buildpack builds'
  Correctly handle platform specific buildpack builds

Closes gh-47292
2025-11-12 13:27:07 -08:00
Brian Clozel d161aafcdf Restrict Kotlin serialization when alternative is available
This commit applies similar changes already contributed to the
`HttpMessageConverter` stack for MVC applications.
Since there was no auto-configuration for Kotlinx JSON Serialization on
the reactive side, this commit adds a relevant `CodecCustomizer` that
will use an available `Json` bean and use it to configure a codec that:

* will only consider `@Serializable`-annotated types if another JSON
  library is available
* will use a broader support with Kotlinx Serialization otherwise

Fixes gh-48070
2025-11-12 21:09:39 +01:00
Andy Wilkinson eb381d642a Provide default values for Kotlinx Serialization JSON properties
Closes gh-48097
2025-11-12 19:50:20 +00:00
Phillip Webb 39f3d1c72c Polish 'Correctly handle platform specific buildpack builds'
See gh-47292
2025-11-12 11:07:29 -08:00
hojooo 913c434b90 Correctly handle platform specific buildpack builds
Prior to this commit, performing a build on a ARM Mac with the default
configuration and then building it again with the image platform set to
`linux/amd64` results in an "Image platform mismatch detected" failure.

This is due to the fact that `docker inspect` returns JSON for the
default platform, regardless of the fact that another architecture
has been pulled.

To solve the issue, the `inspect` API call on Docker 1.49+ can now
accept a platform query parameter which when specified returns platform
specific JSON.

At the time of this commit, the Docker API documentation hasn't been
updated, despite PR https://github.com/moby/moby/pull/49586 being
merged.

In addition to using the correct inspect JSON, we also need to pin
the run image we use to a specific digest. Without doing this,
buildpacks revert back to the default platform image and
"content digest not found" errors are thrown (similar to
https://github.com/buildpacks/docs/issues/818).

See gh-47292

Signed-off-by: hojooo <ghwn5833@gmail.com>
2025-11-12 10:33:22 -08:00
Andy Wilkinson 5699915383 Rename module for Kotlinx Serialization JSON support
Closes gh-48076
2025-11-12 17:34:28 +00:00
Brian Clozel 44f0c772a2 Configure JSON and XML converters on HttpMessageConverters
This commit ensures that XML and JSON converters on both client and
server are configured using the dedicated methods on
`HttpMessageConverters`, instead of pushing them ahead of default
converters.

Closes gh-47917
Fixes gh-48096
2025-11-12 16:15:13 +01:00
Andy Wilkinson edd530c7e1 Merge branch '3.5.x'
Closes gh-48095
2025-11-12 14:56:19 +00:00
Andy Wilkinson adbeb7a03d Include in the appendix properties described using only manual metadata
Closes gh-48073
2025-11-12 14:55:06 +00:00
Stéphane Nicoll 4dd933738c Upgrade to Tomcat 11.0.14
Closes gh-48094
2025-11-12 15:51:03 +01:00
Stéphane Nicoll 0cb87dd047 Upgrade to Prometheus Client 1.4.3
Closes gh-48093
2025-11-12 15:51:03 +01:00
Stéphane Nicoll 5dffa3da4e Upgrade to MySQL 9.5.0
Closes gh-48092
2025-11-12 15:51:03 +01:00
Stéphane Nicoll 9aea720fd8 Upgrade to Logback 1.5.21
Closes gh-48091
2025-11-12 15:51:03 +01:00
Stéphane Nicoll 24cc3e490f Upgrade to jOOQ 3.19.28
Closes gh-48090
2025-11-12 15:51:03 +01:00
Stéphane Nicoll d530c2c104 Upgrade to Jackson Bom 3.0.2
Closes gh-48089
2025-11-12 15:51:03 +01:00
Stéphane Nicoll 978959658b Upgrade to Hibernate 7.1.7.Final
Closes gh-48088
2025-11-12 15:51:03 +01:00
Stéphane Nicoll c7bc4ff263 Upgrade to DB2 JDBC 12.1.3.0
Closes gh-48087
2025-11-12 15:51:03 +01:00
Andy Wilkinson 8e71f9b77a Merge branch '3.5.x'
Closes gh-48082
2025-11-12 14:29:26 +00:00
Andy Wilkinson 0458fa73e1 Merge branch '3.4.x' into 3.5.x
Closes gh-48081
2025-11-12 14:28:58 +00:00
Andy Wilkinson b6d9c48cbd Upgrade to antora-ui-spring 0.4.20
Closes gh-48077
2025-11-12 14:28:49 +00:00
Stéphane Nicoll 0be793ad11 Merge branch '3.5.x' 2025-11-12 15:27:56 +01:00
Stéphane Nicoll f84b1811f2 Merge branch '3.4.x' into 3.5.x 2025-11-12 15:27:50 +01:00
Stéphane Nicoll 4c0edafb0d Upgrade to Tomcat 10.1.49
Closes gh-48086
2025-11-12 15:15:04 +01:00
Stéphane Nicoll a0962920ba Upgrade to Logback 1.5.21
Closes gh-48085
2025-11-12 15:14:59 +01:00
Stéphane Nicoll 43cc205430 Upgrade to jOOQ 3.19.28
Closes gh-48084
2025-11-12 15:14:55 +01:00
Stéphane Nicoll 3ffdf4cb0d Upgrade to DB2 JDBC 12.1.3.0
Closes gh-48083
2025-11-12 15:14:51 +01:00
Stéphane Nicoll 2993a6c3ff Upgrade to Tomcat 10.1.49
Closes gh-48080
2025-11-12 15:14:06 +01:00
Stéphane Nicoll 7c36b7f01d Upgrade to Logback 1.5.21
Closes gh-48079
2025-11-12 15:14:02 +01:00
Stéphane Nicoll df21e2e24d Upgrade to jOOQ 3.19.28
Closes gh-48078
2025-11-12 15:13:58 +01:00
Stéphane Nicoll 481e92dc4b Merge branch '3.5.x'
Closes gh-48075
2025-11-12 13:39:47 +01:00
Stéphane Nicoll f64e84e8c7 Prevent upgrade to Cassandra Driver 4.19.1
Closes gh-48074
2025-11-12 13:37:09 +01:00
Stéphane Nicoll 3e0eb7d930 Merge branch '3.5.x' 2025-11-12 13:21:12 +01:00
Stéphane Nicoll c7c09588c1 Adapt assertion to relax newlines check
See gh-47984
2025-11-12 13:20:51 +01:00