From a498faaab248d0512bad9e66afbd8fb1d6c42a66 Mon Sep 17 00:00:00 2001 From: Paul Horton Date: Wed, 10 Apr 2024 11:00:45 +0200 Subject: [PATCH] doc: poor merge resolved Signed-off-by: Paul Horton --- docs/schema-support.rst | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/docs/schema-support.rst b/docs/schema-support.rst index 43afec7a..57b4cdb5 100644 --- a/docs/schema-support.rst +++ b/docs/schema-support.rst @@ -21,6 +21,9 @@ The following sub-sections aim to explain what support this library provides and by calling out support for data as defined in the latest CycloneDX standard specification, regardless of whether it is supported in prior versions of the CycloneDX schema. +Root Level Schema Support +------------------------- + +----------------------------+---------------+---------------------------------------------------------------------------------------------------+ | Data Path | Supported? | Notes | +============================+===============+===================================================================================================+ @@ -28,9 +31,9 @@ supported in prior versions of the CycloneDX schema. +----------------------------+---------------+---------------------------------------------------------------------------------------------------+ | ``bom[@serialNumber]`` | Yes | | +----------------------------+---------------+---------------------------------------------------------------------------------------------------+ -| ``bom.metadata`` | Yes | | +| ``bom.metadata`` | Yes | Not supported: ``lifecycles`` | +----------------------------+---------------+---------------------------------------------------------------------------------------------------+ -| ``bom.components`` | Yes | Not supported: ``modified`` (as it is deprecated), ``signature``. | +| ``bom.components`` | Yes | Not supported: ``modified`` (as it is deprecated), ``modelCard``, ``data``, ``signature``. | +----------------------------+---------------+---------------------------------------------------------------------------------------------------+ | ``bom.services`` | Yes | Not supported: ``signature``. | +----------------------------+---------------+---------------------------------------------------------------------------------------------------+ @@ -56,5 +59,22 @@ supported in prior versions of the CycloneDX schema. | ``bom.signature`` | No | | +----------------------------+---------------+---------------------------------------------------------------------------------------------------+ +Internal Model Schema Support +----------------------------- + ++----------------------------+---------------+----------------------------------------------------------------------------------------------+ +| Internal Model | Supported? | Notes | ++============================+===============+==============================================================================================+ +| ``ComponentEvidence`` |Yes | Not currently supported: ``callstack``, ``identity``, ``occurrences``. | ++----------------------------+---------------+----------------------------------------------------------------------------------------------+ +| ``DisjunctiveLicense`` |Yes | Not currently supported: ``@bom-ref``, ``licensing``, ``properties``. | ++----------------------------+---------------+----------------------------------------------------------------------------------------------+ +| ``LicenseExpression`` |Yes | Not currently supported: ``@bom-ref`` | ++----------------------------+---------------+----------------------------------------------------------------------------------------------+ +| ``OrganizationalContact`` |Yes | Not currently supported: ``@bom-ref`` | ++----------------------------+---------------+----------------------------------------------------------------------------------------------+ +| ``OrganizationalEntity`` |Yes | Not currently supported: ``@bom-ref`` | ++----------------------------+---------------+----------------------------------------------------------------------------------------------+ .. _schema specification bug 130: https://github.com/CycloneDX/specification/issues/130 +