From f8ed6f328615f2a2890666e85e35959b99d5c561 Mon Sep 17 00:00:00 2001 From: Wleeaf <179125857+wleeaf@users.noreply.github.com> Date: Sun, 25 Oct 2026 10:31:43 +0000 Subject: [PATCH] Write standard levels as level elements in XML Standard.getLevels had no XML wrapper annotations, so the XML generator wrote each level as a element inside . The XSD expects , so re-generating the spec test file valid-standard-1.6.xml (or the JSON one) gave an invalid BOM. Annotate it like getRequirements and Level.getRequirements. Signed-off-by: Wleeaf <179125857+wleeaf@users.noreply.github.com> --- .../java/org/cyclonedx/model/definition/Standard.java | 2 ++ src/test/java/org/cyclonedx/BomXmlGeneratorTest.java | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/org/cyclonedx/model/definition/Standard.java b/src/main/java/org/cyclonedx/model/definition/Standard.java index 5d02514e3..d082c7007 100644 --- a/src/main/java/org/cyclonedx/model/definition/Standard.java +++ b/src/main/java/org/cyclonedx/model/definition/Standard.java @@ -102,6 +102,8 @@ public void setRequirements(final List requirements) { this.requirements = requirements; } + @JacksonXmlElementWrapper(localName = "levels") + @JacksonXmlProperty(localName = "level") public List getLevels() { return levels; } diff --git a/src/test/java/org/cyclonedx/BomXmlGeneratorTest.java b/src/test/java/org/cyclonedx/BomXmlGeneratorTest.java index f04e1f0d4..b529ce2c2 100644 --- a/src/test/java/org/cyclonedx/BomXmlGeneratorTest.java +++ b/src/test/java/org/cyclonedx/BomXmlGeneratorTest.java @@ -1335,6 +1335,16 @@ private File writeToFile(String xmlString) throws Exception { return tempFile; } + @Test + public void schema16StandardLevelsGenerationTest() throws Exception { + BomXmlGenerator generator = BomGeneratorFactory.createXml(Version.VERSION_16, createCommonBomXml("/1.6/valid-standard-1.6.xml")); + String xml = generator.toXmlString(); + assertTrue(xml.contains(""), xml); + File file = writeToFile(xml); + XmlParser parser = new XmlParser(); + assertTrue(parser.isValid(file, Version.VERSION_16)); + } + private Bom createCommonBomXml(String resource) throws Exception { final byte[] bomBytes = Objects.requireNonNull(this.getClass().getResourceAsStream(resource)).readAllBytes(); XmlParser parser = new XmlParser();