root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
53,909 Commits 28 Branches 362 Tags 293 MiB
Commit Graph

466 Commits

Author SHA1 Message Date
Moritz Halbritter 5c32890f43 Merge branch '3.4.x' 
Closes gh-45035
 2025-04-08 15:28:23 +02:00
Moritz Halbritter 97ed923e50 Explicitly set Host header when using LocalHttpClientTransport 
Closes gh-45028
 2025-04-08 14:29:16 +02:00
Phillip Webb 39ef5ae2d5 Merge branch '3.4.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
2025-04-03 18:06:48 -07:00
Phillip Webb fc9937d05a Merge branch '3.3.x' into 3.4.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
2025-04-03 18:06:33 -07:00
Phillip Webb 88e8c17369 Update copyright year of changed files
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
2025-04-03 18:06:14 -07:00
Moritz Halbritter 6d2fb65340 Merge branch '3.4.x' 
Closes gh-44728
 2025-03-17 08:55:25 +01:00
Moritz Halbritter 01719c41fa Merge branch '3.3.x' into 3.4.x 
Closes gh-44727
 2025-03-17 08:55:16 +01:00
youngjin_dev a164dab25d Fix Integer conversion in getProgress() method 
See gh-44718

Signed-off-by: youngjin_dev <qazkyj0310@gmail.com>
 2025-03-17 08:52:15 +01:00
Phillip Webb a55a6be4ed Merge branch '3.4.x' 2025-03-14 15:15:33 -07:00
Phillip Webb 6eb7d3411b Merge branch '3.3.x' into 3.4.x 2025-03-14 15:14:30 -07:00
Phillip Webb 896b5767fe Polish 2025-03-14 13:36:04 -07:00
Stéphane Nicoll 3ea9c56ea0 Merge branch '3.4.x' 
Closes gh-44685
 2025-03-12 08:59:27 +01:00
Moritz Halbritter 12c9bfff2f Merge branch '3.4.x' 
Closes gh-44640
 2025-03-07 11:03:41 +01:00
Moritz Halbritter d93f4f5554 Throw exception if pulled image platform doesn't match the requested platform 
Closes gh-44059
 2025-03-07 09:28:17 +01:00
Moritz Halbritter 6f464e71da Merge branch '3.4.x' 2025-03-07 08:21:32 +01:00
Moritz Halbritter 282571ae1e Merge branch '3.3.x' into 3.4.x 2025-03-07 08:21:13 +01:00
Moritz Halbritter 5ec099756f Fix potential NPE when passing 'null' as params 2025-03-07 08:17:37 +01:00
Moritz Halbritter dde9bfbeaa Merge branch '3.4.x' 
Closes gh-44631
 2025-03-06 17:41:08 +01:00
Moritz Halbritter 2e74ce8bf2 Merge branch '3.3.x' into 3.4.x 
Closes gh-44630
 2025-03-06 17:39:26 +01:00
Moritz Halbritter a807a07a59 Always try to deserialize message in case of Docker transport errors 
Before this commit, if the status code was 4xx or 500, we tried to read the errors
object, consuming the http entity. When we tried to deserialize the message,
the http entity was already consumed, an IOException has been thrown and null
is returned for the message.

Now, we read the content in a byte[] and deserialize the errors and the message
from that. This ensures that we can read both the errors and the message.

Closes gh-44628
 2025-03-06 17:27:00 +01:00
Moritz Halbritter 3be5e6cc3e Polish "Improve logging in DockerApi" 
See gh-44412
 2025-02-25 13:14:38 +01:00
Dmytro Nosan 9a940702bc Improve logging in DockerApi 
This commit introduces a new constructor in `DockerApi`
that accepts `DockerLogger` as a parameter.

The `DockerLogger` is a pretty simple callback interface used to
provide DockerApi output logging.

See gh-44412

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
 2025-02-25 13:07:23 +01:00
Moritz Halbritter ae16856bda Revert "Use noble buildpacks instead of jammy" 
This reverts commit 4f672b9588.

See gh-42711
 2025-02-19 16:00:27 +01:00
Moritz Halbritter 4f672b9588 Use noble buildpacks instead of jammy 
Closes gh-42711
 2025-02-19 13:59:21 +01:00
Phillip Webb 651a39b3f6 Merge branch '3.4.x' 2025-02-18 15:12:07 -08:00
Johnny Lim c9320de559 Use consistent exception messages in Assert calls 
See gh-44044

Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-02-03 13:58:59 +01:00
Andy Wilkinson 1e43b0003f Merge branch '3.4.x' 
Closes gh-43951
 2025-01-24 08:54:50 +00:00
Andy Wilkinson 2f29a49a1d Remove APIs deprecated for removal in 3.5 
Closes gh-43788
 2025-01-14 13:59:24 +00:00
Phillip Webb a49719d73e Use consistent exception messages in Assert calls 
Update `Assert` calls to consistently use messages of the form
"'item' must [not] ...".

Closes gh-43780
 2025-01-11 21:18:47 -08:00
Phillip Webb f08188d5cf Change relevant Assert calls to throw IllegalStateException 
Change certain Assert class from `assert...` to `assertState`
so that a more appropriate `IllegalStateException` is thrown.

Fixes gh-43779
 2025-01-11 21:16:36 -08:00
Phillip Webb 123502b8d7 Restore use of fixed version when calling docker APIs 
Update `DockerApi` so that calls are made using a fixed version. For
most calls this will be `v1.24`, however, for calls with a platform
we must use the `v1.41`.

When possible, we check that the Docker version in use meets the
required minimum, however, if we can't detect the running version
we now proceed and let the actual API call fail. This is due to the
fact that the `/_ping` endpoint may not always be available. For
example, it is restricted when building from a BitBucket CI pipeline.

Fixes gh-43452
 2024-12-10 13:14:20 -08:00
Phillip Webb dd64b0648f Merge branch '3.3.x' 
Closes gh-43356
 2024-12-02 13:59:53 -08:00
Phillip Webb 0afbc0b23c Polish 'Accept Docker progress on numbers >2GB' 
Restore `int` returns for existing methods and deprecate them in
favor of a new `asPercentage()` method.

See gh-43328
 2024-12-02 13:58:03 -08:00
Wolfgang Kronberg d8565185e8 Accept Docker progress on numbers >2GB 
Update `ProgressUpdateEvent` to support images of a file size
>2GB without provoking build failures.

See gh-43328
 2024-12-02 13:56:09 -08:00
Andy Wilkinson 32433e84f3 Merge branch '3.3.x' 
Closes gh-43270
 2024-11-22 15:46:38 +00:00
Andy Wilkinson bb3651b7d1 Reduce warnings reported by Eclipse 
Closes gh-43269
 2024-11-22 15:39:35 +00:00
Phillip Webb f77c3bbd6b Merge branch '3.3.x' 
Closes gh-43171
 2024-11-14 15:50:15 -08:00
Phillip Webb 66ec6b32e3 Merge branch '3.2.x' into 3.3.x 
Closes gh-43170
 2024-11-14 15:50:04 -08:00
Phillip Webb 25b6477aa8 Support alternative media type format 
Update `ExportedImageTar` media type detection to support `tar+gzip`
as well as `tar.gzip`. Recent updates to Docker Desktop appear to have
changed the format.

Fixes gh-43126
 2024-11-14 15:25:15 -08:00
Phillip Webb a293560237 Support nested OCI indexes 
Update `ExportedImageTar.IndexLayerArchiveFactory` to support nested
indexes. Nested indexes support a layer of interaction where the
`index.json` file points to a blob that contains the read index to use.

Prior to this commit, we only supported indexes provided directly by
the `index.json` file. This missing support results in "buildpack.toml:
no such file or directory" errors when referencing specific buildpacks
and using Docker Engine 27.3.1 or above.

See gh-43126
 2024-11-14 15:24:47 -08:00
Andy Wilkinson c6e19517be Merge branch '3.3.x' 
Closes gh-43070
 2024-11-08 09:55:36 +00:00
Andy Wilkinson 81872afd53 Merge branch '3.2.x' into 3.3.x 
Closes gh-43069
 2024-11-08 09:55:22 +00:00
Andy Wilkinson 2fa28fb822 Improve error reporting when image loading fails 
Closes gh-31243
 2024-11-08 09:51:57 +00:00
Phillip Webb dbb5e05ebf Merge branch '3.3.x' 
Closes gh-42992
 2024-11-04 16:19:04 -08:00
Phillip Webb 189e49f6d6 Merge branch '3.2.x' into 3.3.x 
Closes gh-42991
 2024-11-04 15:56:29 -08:00
Phillip Webb c62a018830 Align buildpack certificate and key parsers with SSL versions 
Closes gh-37969
 2024-11-04 15:53:39 -08:00
Phillip Webb 269f18c0ca Merge branch '3.3.x' 
Closes gh-42990
 2024-11-04 14:34:39 -08:00
Phillip Webb 4a7c757945 Merge branch '3.2.x' into 3.3.x 
Closes gh-42989
 2024-11-04 14:34:17 -08:00
Phillip Webb 202db9b7f4 Update copyright year of changed files 2024-11-04 14:28:23 -08:00
Andy Wilkinson a3168e3a2f Centralize dependency management of Commons Compress 
Closes gh-39368
 2024-11-04 11:45:41 +00:00