Commit Graph

56307 Commits

Author SHA1 Message Date
Stéphane Nicoll e39d332b3a Upgrade to Jetty 12.0.30
Closes gh-48119
2025-11-13 14:06:18 +01:00
Stéphane Nicoll 814086340f Upgrade to Spring Framework 6.2.13
Closes gh-48036
2025-11-13 14:05:07 +01:00
Stéphane Nicoll 2b40bae906 Upgrade to Jetty 12.0.30
Closes gh-48118
2025-11-13 14:05:07 +01:00
Andy Wilkinson d9e6be9b21 Merge branch '3.4.x' into 3.5.x
Closes gh-48114
2025-11-13 11:24:24 +00:00
Andy Wilkinson 59224fdd6f Document Actuator's ObjectMapper isolation
Closes gh-47039
2025-11-13 11:24:16 +00:00
Andy Wilkinson 4e75a07ef7 Merge branch '3.4.x' into 3.5.x
Closes gh-48111
2025-11-13 10:56:42 +00:00
Andy Wilkinson eeebc37813 Document how to configure ServletContext init parameters
Closes gh-47951
2025-11-13 10:56:18 +00:00
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 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 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 1ce1b7ee35 Merge branch '3.4.x' into 3.5.x
Closes gh-48105
2025-11-13 10:27:51 +01:00
Stéphane Nicoll 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 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 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
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 adbeb7a03d Include in the appendix properties described using only manual metadata
Closes gh-48073
2025-11-12 14:55:06 +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 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 f64e84e8c7 Prevent upgrade to Cassandra Driver 4.19.1
Closes gh-48074
2025-11-12 13:37:09 +01:00
Stéphane Nicoll c7c09588c1 Adapt assertion to relax newlines check
See gh-47984
2025-11-12 13:20:51 +01:00
Stéphane Nicoll 52951ed8f4 Apply checks for manual configuration metadata
This commit adds a 'org.springframework.boot.configuration-metadata'
plugin to be used for projects that only define manual metadata. Such
project do not need the annotation processor, but do not to check that
the structure of the metadata content matches the same rules.

Closes gh-47984
2025-11-12 13:01:56 +01:00
Andy Wilkinson bd2a8acc21 Merge branch '3.4.x' into 3.5.x
Closes gh-48065
2025-11-11 18:59:13 +00:00
Andy Wilkinson d697fc0b35 Upgrade to Antora UI Spring v0.4.19
Closes gh-48064
2025-11-11 18:57:12 +00:00
Andy Wilkinson bab7307606 Merge branch '3.4.x' into 3.5.x
Closes gh-48062
2025-11-11 18:44:52 +00:00
Andy Wilkinson 5aeaa74508 Document how soon-to-expire SSL certs are reported
Closes gh-45564
2025-11-11 18:44:21 +00:00
Andy Wilkinson f1b26e9402 Merge branch '3.4.x' into 3.5.x
Closes gh-48061
2025-11-11 17:02:30 +00:00
Andy Wilkinson a21bfc2ff5 Delay ServletContext destruction until Undertow is destroyed
Previously, all destruction was done in the stop method including
closing any Closeables registered with the server. One of these
Closeables managed the lifecycle of the DeploymentManager for the
servlet deployment. Closing it made the servlet context unusable
in `@PreDestroy` methods and upon restart.

This commit moves the closing of the registered Closeables into
destroy(). This allows `@PreDestory` methods to use the
ServletContext. It also allows the server to be stopped and then
restarted without making the ServletContext unusable as it's left
running while the server itself is stopped and not accepting
requests.

Fixes gh-47141
2025-11-11 17:00:48 +00:00
Andy Wilkinson c7c0d33b86 Revert "Merge branch '3.4.x' into 3.5.x"
This reverts commit 4089156b3c, reversing
changes made to 049c6d50d5.

See gh-48058
2025-11-11 16:37:27 +00:00
Andy Wilkinson 8249929b68 Revert "Stop throwing PortInUseException for unassignable address"
This reverts commit 5229ac7e58.

The change works on macOS but not on Linux.

See gh-47618
2025-11-11 16:35:24 +00:00
Andy Wilkinson 4089156b3c Merge branch '3.4.x' into 3.5.x
Closes gh-48058
2025-11-11 16:09:14 +00:00
Andy Wilkinson 5229ac7e58 Stop throwing PortInUseException for unassignable address
Previously, an unassignable address would result in NettyWebServer
incorrectly throwing a PortInUseException.

Fixes gh-47618
2025-11-11 16:07:35 +00:00
Andy Wilkinson 049c6d50d5 Merge branch '3.4.x' into 3.5.x
Closes gh-48056
2025-11-11 15:22:52 +00:00
Andy Wilkinson d08ac5ce4a Allow cache removals to be registered as a function counter
Fixes gh-46212
2025-11-11 15:21:40 +00:00
Andy Wilkinson 5c711e2a88 Merge branch '3.4.x' into 3.5.x
Closes gh-48054
2025-11-11 14:04:54 +00:00
Andy Wilkinson 06fd384e59 Include WebSecurityCustomizer components in WebMvcTest
This commit also tests that WebSecurityConfigurer components are
included. They include was already there but the functionality was
untested.

Fixes gh-47255
2025-11-11 14:03:25 +00:00