Merge branch '3.4.x' into 3.5.x

snicoll · snicoll · commit c8a990f40a16 · 2025-10-19T16:48:03.000+02:00
Closes spring-projectsgh-47703
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ExportedImageTar.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ExportedImageTar.java
@@ -130,7 +130,7 @@ static LayerArchiveFactory create(ImageReference reference, Path tarFile) throws
 						() -> "Exported image '%s' does not contain 'index.json' or 'manifest.json'"
 							.formatted(reference));
 				return (index != null) ? new IndexLayerArchiveFactory(tarFile, index)
-						: new ManifestLayerArchiveFactory(tarFile, manifest);
+						: new ManifestLayerArchiveFactory(manifest);
 			}
 		}
 
@@ -266,7 +266,7 @@ private static class ManifestLayerArchiveFactory extends LayerArchiveFactory {
 
 		private Set<String> layers;
 
-		ManifestLayerArchiveFactory(Path tarFile, ImageArchiveManifest manifest) {
+		ManifestLayerArchiveFactory(ImageArchiveManifest manifest) {
 			this.layers = manifest.getEntries()
 				.stream()
 				.flatMap((entry) -> entry.getLayers().stream())

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ static LayerArchiveFactory create(ImageReference reference, Path tarFile) throws`
`130`	`130`	`() -> "Exported image '%s' does not contain 'index.json' or 'manifest.json'"`
`131`	`131`	`.formatted(reference));`
`132`	`132`	`return (index != null) ? new IndexLayerArchiveFactory(tarFile, index)`
`133`		`- : new ManifestLayerArchiveFactory(tarFile, manifest);`
	`133`	`+ : new ManifestLayerArchiveFactory(manifest);`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
`@@ -266,7 +266,7 @@ private static class ManifestLayerArchiveFactory extends LayerArchiveFactory {`
`266`	`266`
`267`	`267`	`private Set<String> layers;`
`268`	`268`
`269`		`- ManifestLayerArchiveFactory(Path tarFile, ImageArchiveManifest manifest) {`
	`269`	`+ ManifestLayerArchiveFactory(ImageArchiveManifest manifest) {`
`270`	`270`	`this.layers = manifest.getEntries()`
`271`	`271`	`.stream()`
`272`	`272`	`.flatMap((entry) -> entry.getLayers().stream())`