spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Polish "Add SBOM manifest attributes to repackaged Maven wars"

Browse Source 
See gh-51551

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
This commit is contained in:
Andy Wilkinson
2026-09-09 14:44:51 +01:00
parent bfd05e38b5
commit 007ca201e1
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loader/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java
+10 -15
View File
@@ -687,31 +687,26 @@ abstract class AbstractPackagerTests<P extends Packager> {
}
@Test
void sbomManifestEntriesAreWritten() throws IOException {
this.testJarFile.addClass("com/example/Application.class", ClassWithMainMethod.class);
this.testJarFile.addFile("META-INF/sbom/application.cdx.json", new ByteArrayInputStream(new byte[0]));
P packager = createPackager(this.testJarFile.getFile());
execute(packager, NO_LIBRARIES);
Manifest manifest = getPackagedManifest();
assertThat(manifest).isNotNull();
assertThat(manifest.getMainAttributes().getValue("Sbom-Format")).isEqualTo("CycloneDX");
assertThat(manifest.getMainAttributes().getValue("Sbom-Location"))
.isEqualTo("META-INF/sbom/application.cdx.json");
void sbomManifestEntriesAreWrittenForJar() throws IOException {
sbomManifestEntriesAreWritten(new Layouts.Jar(), "");
}
@Test
void sbomManifestEntriesAreWrittenForWar() throws IOException {
this.testJarFile.addClass("WEB-INF/classes/com/example/Application.class", ClassWithMainMethod.class);
this.testJarFile.addFile("WEB-INF/classes/META-INF/sbom/application.cdx.json",
new ByteArrayInputStream(new byte[0]));
sbomManifestEntriesAreWritten(new Layouts.War(), "WEB-INF/classes/");
}
private void sbomManifestEntriesAreWritten(Layout layout, String prefix) throws IOException {
this.testJarFile.addClass(prefix + "com/example/Application.class", ClassWithMainMethod.class);
this.testJarFile.addFile(prefix + "META-INF/sbom/application.cdx.json", new ByteArrayInputStream(new byte[0]));
P packager = createPackager(this.testJarFile.getFile());
packager.setLayout(new Layouts.War());
packager.setLayout(layout);
execute(packager, NO_LIBRARIES);
Manifest manifest = getPackagedManifest();
assertThat(manifest).isNotNull();
assertThat(manifest.getMainAttributes().getValue("Sbom-Format")).isEqualTo("CycloneDX");
assertThat(manifest.getMainAttributes().getValue("Sbom-Location"))
.isEqualTo("WEB-INF/classes/META-INF/sbom/application.cdx.json");
.isEqualTo(prefix + "META-INF/sbom/application.cdx.json");
}
private File createLibraryJar() throws IOException {