From 9b8323efc85a5032bb9aa964c379f4c3b9c1cf26 Mon Sep 17 00:00:00 2001
From: Steve Springett <steve@springett.us>
Date: Fri, 30 Aug 2024 23:25:49 -0500
Subject: [PATCH 01/42] creating 1.7 from 1.6. Updating doc generation and
templates.
---
docgen/json/gen.sh | 3 +-
docgen/json/templates/cyclonedx/base.html | 2 +
docgen/xml/gen.sh | 1 +
docgen/xml/xs3p.xsl | 2 +
schema/bom-1.7.proto | 2208 ++++++
schema/bom-1.7.schema.json | 5699 ++++++++++++++
schema/bom-1.7.xsd | 8307 +++++++++++++++++++++
7 files changed, 16221 insertions(+), 1 deletion(-)
create mode 100644 schema/bom-1.7.proto
create mode 100644 schema/bom-1.7.schema.json
create mode 100644 schema/bom-1.7.xsd
diff --git a/docgen/json/gen.sh b/docgen/json/gen.sh
index 19149d5b..c780717a 100755
--- a/docgen/json/gen.sh
+++ b/docgen/json/gen.sh
@@ -7,7 +7,7 @@ DOCS_PATH="$THIS_PATH/docs"
TEMPLATES_PATH="$THIS_PATH/templates"
rm -f -R "$DOCS_PATH"
-mkdir -p "$DOCS_PATH/"{1.2,1.3,1.4,1.5,1.6}
+mkdir -p "$DOCS_PATH/"{1.2,1.3,1.4,1.5,1.6,1.7}
# Check to see if generate-schema-doc is executable and is in the path. If not, install JSON Schema for Humans.
if ! [ -x "$(command -v generate-schema-doc)" ]
@@ -50,3 +50,4 @@ generate 1.3
generate 1.4
generate 1.5
generate 1.6
+generate 1.7
diff --git a/docgen/json/templates/cyclonedx/base.html b/docgen/json/templates/cyclonedx/base.html
index 6f89d18b..1f7e3005 100644
--- a/docgen/json/templates/cyclonedx/base.html
+++ b/docgen/json/templates/cyclonedx/base.html
@@ -40,12 +40,14 @@
v${version} (JSON)
</a>
<ul class="dropdown-menu" aria-labelledby="navbarScrollingDropdown">
+ <li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.7/json/">v1.7 (JSON)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.6/json/">v1.6 (JSON)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.5/json/">v1.5 (JSON)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.4/json/">v1.4 (JSON)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.3/json/">v1.3 (JSON)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.2/json/">v1.2 (JSON)</a></li>
<li><hr class="dropdown-divider"/></li>
+ <li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.7/xml/">v1.7 (XML)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.6/xml/">v1.6 (XML)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.5/xml/">v1.5 (XML)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.4/xml/">v1.4 (XML)</a></li>
diff --git a/docgen/xml/gen.sh b/docgen/xml/gen.sh
index beb4b813..74df40bd 100755
--- a/docgen/xml/gen.sh
+++ b/docgen/xml/gen.sh
@@ -41,3 +41,4 @@ generate 1.3
generate 1.4
generate 1.5
generate 1.6
+generate 1.7
diff --git a/docgen/xml/xs3p.xsl b/docgen/xml/xs3p.xsl
index 27ef508e..077bf0f5 100644
--- a/docgen/xml/xs3p.xsl
+++ b/docgen/xml/xs3p.xsl
@@ -339,12 +339,14 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle version-selector" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">v<xsl:value-of select="$cycloneDxVersion"/> (XML)<span class="caret"></span></a>
<ul class="dropdown-menu">
+ <li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.7/json/">v1.7 (JSON)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.6/json/">v1.6 (JSON)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.5/json/">v1.5 (JSON)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.4/json/">v1.4 (JSON)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.3/json/">v1.3 (JSON)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.2/json/">v1.2 (JSON)</a></li>
<li style="padding:0"><hr class="dropdown-divider"/></li>
+ <li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.7/xml/">v1.7 (XML)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.6/xml/">v1.6 (XML)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.5/xml/">v1.5 (XML)</a></li>
<li><a class="dropdown-item" href="https://cyclonedx.org/docs/1.4/xml/">v1.4 (XML)</a></li>
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
new file mode 100644
index 00000000..94c5ac28
--- /dev/null
+++ b/schema/bom-1.7.proto
@@ -0,0 +1,2208 @@
+syntax = "proto3";
+package cyclonedx.v1_7;
+import "google/protobuf/timestamp.proto";
+
+// Specifies attributes of the text
+message AttachedText {
+ // Specifies the format and nature of the data being attached, helping systems correctly interpret and process the content. Common content type examples include `application/json` for JSON data and `text/plain` for plan text documents. [RFC 2045 section 5.1](https://www.ietf.org/rfc/rfc2045.html#section-5.1) outlines the structure and use of content types. For a comprehensive list of registered content types, refer to the [IANA media types registry](https://www.iana.org/assignments/media-types/media-types.xhtml).
+ optional string content_type = 1;
+ // Specifies the optional encoding the text is represented in
+ optional string encoding = 2;
+ // SimpleContent value of element. Proactive controls such as input validation and sanitization should be employed to prevent misuse of attachment text.
+ string value = 3;
+}
+
+message Bom {
+ // The version of the CycloneDX specification a BOM is written to (starting at version 1.3)
+ string spec_version = 1;
+ // The version allows component publishers/authors to make changes to existing BOMs to update various aspects of the document such as description or licenses. When a system is presented with multiple BOMs for the same component, the system should use the most recent version of the BOM. The default version is '1' and should be incremented for each version of the BOM that is published. Each version of a component should have a unique BOM and if no changes are made to the BOMs, then each BOM will have a version of '1'.
+ optional int32 version = 2;
+ // Every BOM generated should have a unique serial number, even if the contents of the BOM being generated have not changed over time. The process or tool responsible for creating the BOM should create random UUID's for every BOM generated.
+ optional string serial_number = 3;
+ // Provides additional information about a BOM.
+ optional Metadata metadata = 4;
+ // Provides the ability to document a list of components.
+ repeated Component components = 5;
+ // Provides the ability to document a list of external services.
+ repeated Service services = 6;
+ // Provides the ability to document external references related to the BOM or to the project the BOM describes.
+ repeated ExternalReference external_references = 7;
+ // Provides the ability to document dependency relationships.
+ repeated Dependency dependencies = 8;
+ // Compositions describe constituent parts (including components, services, and dependency relationships) and their completeness. The completeness of vulnerabilities expressed in a BOM may also be described.
+ repeated Composition compositions = 9;
+ // Vulnerabilities identified in components or services.
+ repeated Vulnerability vulnerabilities = 10;
+ // Comments made by people, organizations, or tools about any object with a bom-ref, such as components, services, vulnerabilities, or the BOM itself. Unlike inventory information, annotations may contain opinion or commentary from various stakeholders.
+ repeated Annotation annotations = 11;
+ // Specifies optional, custom, properties
+ repeated Property properties = 12;
+ // Describes how a component or service was manufactured or deployed. This is achieved through the use of formulas, workflows, tasks, and steps, which declare the precise steps to reproduce along with the observed formulas describing the steps which transpired in the manufacturing process.
+ repeated Formula formulation = 13;
+ // The list of declarations which describe the conformance to standards. Each declaration may include attestations, claims, and evidence.
+ repeated Declarations declarations = 14;
+ // A collection of reusable objects that are defined and may be used elsewhere in the BOM.
+ repeated Definition definitions = 15;
+}
+
+enum Classification {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
+ CLASSIFICATION_NULL = 0;
+ // A software application. Refer to https://en.wikipedia.org/wiki/Application_software for information about applications.
+ CLASSIFICATION_APPLICATION = 1;
+ // A software framework. Refer to https://en.wikipedia.org/wiki/Software_framework for information on how frameworks vary slightly from libraries.
+ CLASSIFICATION_FRAMEWORK = 2;
+ // A software library. Refer to https://en.wikipedia.org/wiki/Library_(computing) for information about libraries. All third-party and open source reusable components will likely be a library. If the library also has key features of a framework, then it should be classified as a framework. If not, or is unknown, then specifying library is recommended.
+ CLASSIFICATION_LIBRARY = 3;
+ // A software operating system without regard to deployment model (i.e. installed on physical hardware, virtual machine, image, etc) Refer to https://en.wikipedia.org/wiki/Operating_system
+ CLASSIFICATION_OPERATING_SYSTEM = 4;
+ // A hardware device such as a processor, or chip-set. A hardware device containing firmware should include a component for the physical hardware itself, and another component of type 'firmware' or 'operating-system' (whichever is relevant), describing information about the software running on the device. See also the list of known device properties: https://github.com/CycloneDX/cyclonedx-property-taxonomy/blob/main/cdx/device.md
+ CLASSIFICATION_DEVICE = 5;
+ // A computer file. Refer to https://en.wikipedia.org/wiki/Computer_file for information about files.
+ CLASSIFICATION_FILE = 6;
+ // A packaging and/or runtime format, not specific to any particular technology, which isolates software inside the container from software outside of a container through virtualization technology. Refer to https://en.wikipedia.org/wiki/OS-level_virtualization
+ CLASSIFICATION_CONTAINER = 7;
+ // A special type of software that provides low-level control over a devices hardware. Refer to https://en.wikipedia.org/wiki/Firmware
+ CLASSIFICATION_FIRMWARE = 8;
+ // A special type of software that operates or controls a particular type of device. Refer to https://en.wikipedia.org/wiki/Device_driver
+ CLASSIFICATION_DEVICE_DRIVER = 9;
+ // A runtime environment which interprets or executes software. This may include runtimes such as those that execute bytecode or low-code/no-code application platforms.
+ CLASSIFICATION_PLATFORM = 10;
+ // A model based on training data that can make predictions or decisions without being explicitly programmed to do so.
+ CLASSIFICATION_MACHINE_LEARNING_MODEL = 11;
+ // A collection of discrete values that convey information.
+ CLASSIFICATION_DATA = 12;
+ // A cryptographic asset including algorithms, protocols, certificates, keys, tokens, and secrets.
+ CLASSIFICATION_CRYPTOGRAPHIC_ASSET = 13;
+}
+
+message Commit {
+ // A unique identifier of the commit. This may be version control specific. For example, Subversion uses revision numbers whereas git uses commit hashes.
+ optional string uid = 1;
+ // The URL to the commit. This URL will typically point to a commit in a version control system.
+ optional string url = 2;
+ // The author who created the changes in the commit
+ optional IdentifiableAction author = 3;
+ // The person who committed or pushed the commit
+ optional IdentifiableAction committer = 4;
+ // The text description of the contents of the commit
+ optional string message = 5;
+}
+
+message Component {
+ // Specifies the type of component. For software components, classify as an application if no more specific appropriate classification is available or cannot be determined for the component.
+ Classification type = 1;
+ // The optional mime-type of the component. When used on file components, the mime-type can provide additional context about the kind of file being represented, such as an image, font, or executable. Some library or framework components may also have an associated mime-type.
+ optional string mime_type = 2;
+ // An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 3;
+ // The organization that supplied the component. The supplier may often be the manufacturer but may also be a distributor or repackager.
+ optional OrganizationalEntity supplier = 4;
+ // DEPRECATED - DO NOT USE - This will be removed in a future version - Use `.authors` or `.manufacturer` instead. The person(s) or organization(s) that authored the component
+ optional string author = 5 [deprecated = true];
+ // The person(s) or organization(s) that published the component
+ optional string publisher = 6;
+ // The grouping name or identifier. This will often be a shortened, single name of the company or project that produced the component or the source package or domain name. Whitespace and special characters should be avoided. Examples include: apache, org.apache.commons, and apache.org.
+ optional string group = 7;
+ // The name of the component. This will often be a shortened, single name of the component. Examples: commons-lang3 and jquery
+ string name = 8;
+ // The component version. The version should ideally comply with semantic versioning but is not enforced. Version was made optional in v1.4 of the spec. For backward compatibility, it is RECOMMENDED to use an empty string to represent components without version information.
+ string version = 9;
+ // Specifies a description for the component
+ optional string description = 10;
+ // Specifies the scope of the component. If a scope is not specified, SCOPE_REQUIRED scope should be assumed by the consumer of the BOM
+ optional Scope scope = 11;
+ repeated Hash hashes = 12;
+ // EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)
+ repeated LicenseChoice licenses = 13;
+ // An optional copyright notice informing users of the underlying claims to copyright ownership in a published work.
+ optional string copyright = 14;
+ // DEPRECATED - DO NOT USE. This will be removed in a future version. Specifies a well-formed CPE name. See https://nvd.nist.gov/products/cpe
+ optional string cpe = 15;
+ // Specifies the package-url (PURL). The purl, if specified, must be valid and conform to the specification defined at: https://github.com/package-url/purl-spec
+ optional string purl = 16;
+ // Specifies metadata and content for ISO-IEC 19770-2 Software Identification (SWID) Tags.
+ optional Swid swid = 17;
+ // DEPRECATED - DO NOT USE. This will be removed in a future version. Use the pedigree element instead to supply information on exactly how the component was modified. A boolean value indicating is the component has been modified from the original. A value of true indicates the component is a derivative of the original. A value of false indicates the component has not been modified from the original.
+ optional bool modified = 18;
+ // Component pedigree is a way to document complex supply chain scenarios where components are created, distributed, modified, redistributed, combined with other components, etc.
+ optional Pedigree pedigree = 19;
+ // Provides the ability to document external references related to the component or to the project the component describes.
+ repeated ExternalReference external_references = 20;
+ // Specifies optional sub-components. This is not a dependency tree. It provides a way to specify a hierarchical representation of component assemblies, similar to system -> subsystem -> parts assembly in physical supply chains.
+ repeated Component components = 21;
+ // Specifies optional, custom, properties
+ repeated Property properties = 22;
+ // Specifies optional license and copyright evidence
+ optional Evidence evidence = 23;
+ // Specifies optional release notes.
+ optional ReleaseNotes releaseNotes = 24;
+ // A model card describes the intended uses of a machine learning model, potential limitations, biases, ethical considerations, training parameters, datasets used to train the model, performance metrics, and other relevant data useful for ML transparency.
+ optional ModelCard modelCard = 25;
+ // This object SHOULD be specified for any component of type `data` and MUST NOT be specified for other component types.
+ optional ComponentData data = 26;
+ // Cryptographic assets have properties that uniquely define them and that make them actionable for further reasoning. As an example, it makes a difference if one knows the algorithm family (e.g. AES) or the specific variant or instantiation (e.g. AES-128-GCM). This is because the security level and the algorithm primitive (authenticated encryption) is only defined by the definition of the algorithm variant. The presence of a weak cryptographic algorithm like SHA1 vs. HMAC-SHA1 also makes a difference.
+ optional CryptoProperties cryptoProperties = 27;
+ // The organization that created the component. Manufacturer is common in components created through automated processes. Components created through manual means may have `.authors` instead.
+ optional OrganizationalEntity manufacturer = 28;
+ // The person(s) who created the component. Authors are common in components created through manual processes. Components created through automated means may have `.manufacturer` instead.
+ repeated OrganizationalContact authors = 29;
+ // Textual strings that aid in discovery, search, and retrieval of the associated object. Tags often serve as a way to group or categorize similar or related objects by various attributes. Examples include "json-parser", "object-persistence", "text-to-image", "translation", and "object-detection".
+ repeated string tags = 30;
+ // Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, MUST be valid and conform to the specification defined at: https://www.iana.org/assignments/uri-schemes/prov/gitoid
+ repeated string omniborId = 31;
+ // Specifies the Software Heritage persistent identifier (SWHID). The SWHID, if specified, MUST be valid and conform to the specification defined at: https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html
+ repeated string swhid = 32;
+}
+
+// Specifies the data flow.
+message DataFlow {
+ // Specifies the flow direction of the data.
+ DataFlowDirection flow = 1;
+ // Data classification tags data according to its type, sensitivity, and value if altered, stolen, or destroyed.
+ string value = 2;
+ // Name for the defined data
+ optional string name = 3;
+ // Short description of the data content and usage
+ optional string description = 4;
+ // The URI, URL, or BOM-Link of the components or services the data came in from
+ repeated string source = 5;
+ // The URI, URL, or BOM-Link of the components or services the data is sent to
+ repeated string destination = 6;
+ // Data Governance
+ optional DataGovernance governance = 7;
+}
+
+// Specifies the flow direction of the data. Valid values are: inbound, outbound, bi-directional, and unknown. Direction is relative to the service. Inbound flow states that data enters the service. Outbound flow states that data leaves the service. Bi-directional states that data flows both ways, and unknown states that the direction is not known.
+// buf:lint:ignore ENUM_VALUE_PREFIX -- Enum value names should be prefixed with "DATA_FLOW_DIRECTION_"
+enum DataFlowDirection {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
+ DATA_FLOW_NULL = 0;
+ DATA_FLOW_INBOUND = 1;
+ DATA_FLOW_OUTBOUND = 2;
+ DATA_FLOW_BI_DIRECTIONAL = 3;
+ DATA_FLOW_UNKNOWN = 4;
+}
+
+message Dependency {
+ // References a component or service by its bom-ref attribute
+ string ref = 1;
+ // The bom-ref identifiers of the components or services that are dependencies of this dependency object.
+ repeated Dependency dependencies = 2;
+ // The bom-ref identifiers of the components or services that define a given specification or standard, which are provided or implemented by this dependency object.
+ repeated string provides = 3;
+}
+
+message Diff {
+ // Specifies the optional text of the diff
+ optional AttachedText text = 1;
+ // Specifies the URL to the diff
+ optional string url = 2;
+}
+
+message ExternalReference {
+ // Specifies the type of external reference. There are built-in types to describe common references. If a type does not exist for the reference being referred to, use the "other" type.
+ ExternalReferenceType type = 1;
+ // The URL to the external reference
+ string url = 2;
+ // An optional comment describing the external reference
+ optional string comment = 3;
+ // Optional integrity hashes for the external resource content
+ repeated Hash hashes = 4;
+}
+
+enum ExternalReferenceType {
+ // Use this if no other types accurately describe the purpose of the external reference
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `other` is our fallback, doubling `unspecified`
+ EXTERNAL_REFERENCE_TYPE_OTHER = 0;
+ // Version Control System
+ EXTERNAL_REFERENCE_TYPE_VCS = 1;
+ // Issue, defect tracking system, or an Application Lifecycle Management (ALM) system
+ EXTERNAL_REFERENCE_TYPE_ISSUE_TRACKER = 2;
+ // Website
+ EXTERNAL_REFERENCE_TYPE_WEBSITE = 3;
+ // Security advisories
+ EXTERNAL_REFERENCE_TYPE_ADVISORIES = 4;
+ // Bill-of-material document (CycloneDX, SPDX, SWID, etc)
+ EXTERNAL_REFERENCE_TYPE_BOM = 5;
+ // Mailing list or discussion group
+ EXTERNAL_REFERENCE_TYPE_MAILING_LIST = 6;
+ // Social media account
+ EXTERNAL_REFERENCE_TYPE_SOCIAL = 7;
+ // Real-time chat platform
+ EXTERNAL_REFERENCE_TYPE_CHAT = 8;
+ // Documentation, guides, or how-to instructions
+ EXTERNAL_REFERENCE_TYPE_DOCUMENTATION = 9;
+ // Community or commercial support
+ EXTERNAL_REFERENCE_TYPE_SUPPORT = 10;
+ // Direct or repository download location
+ EXTERNAL_REFERENCE_TYPE_DISTRIBUTION = 11;
+ // The URL to the license file. If a license URL has been defined in the license node, it should also be defined as an external reference for completeness
+ EXTERNAL_REFERENCE_TYPE_LICENSE = 12;
+ // Build-system specific meta file (i.e. pom.xml, package.json, .nuspec, etc)
+ EXTERNAL_REFERENCE_TYPE_BUILD_META = 13;
+ // URL to an automated build system
+ EXTERNAL_REFERENCE_TYPE_BUILD_SYSTEM = 14;
+ // Specifies a way to contact the maintainer, supplier, or provider in the event of a security incident. Common URIs include links to a disclosure procedure, a mailto (RFC-2368) that specifies an email address, a tel (RFC-3966) that specifies a phone number, or dns (RFC-4501) that specifies the records containing DNS Security TXT.
+ EXTERNAL_REFERENCE_TYPE_SECURITY_CONTACT = 15;
+ // Human or machine-readable statements containing facts, evidence, or testimony
+ EXTERNAL_REFERENCE_TYPE_ATTESTATION = 16;
+ // An enumeration of identified weaknesses, threats, and countermeasures, dataflow diagram (DFD), attack tree, and other supporting documentation in human-readable or machine-readable format
+ EXTERNAL_REFERENCE_TYPE_THREAT_MODEL = 17;
+ // The defined assumptions, goals, and capabilities of an adversary.
+ EXTERNAL_REFERENCE_TYPE_ADVERSARY_MODEL = 18;
+ // Identifies and analyzes the potential of future events that may negatively impact individuals, assets, and/or the environment. Risk assessments may also include judgments on the tolerability of each risk.
+ EXTERNAL_REFERENCE_TYPE_RISK_ASSESSMENT = 19;
+ // The location where a component was published. This is often the same as "distribution" but may also include specialized publishing processes that act as an intermediary
+ EXTERNAL_REFERENCE_TYPE_DISTRIBUTION_INTAKE = 20;
+ // A Vulnerability Disclosure Report (VDR) which asserts the known and previously unknown vulnerabilities that affect a component, service, or product including the analysis and findings describing the impact (or lack of impact) that the reported vulnerability has on a component, service, or product
+ EXTERNAL_REFERENCE_TYPE_VULNERABILITY_ASSERTION = 21;
+ // A Vulnerability Exploitability eXchange (VEX) asserts the known vulnerabilities that do not affect a product, product family, or organization, and optionally, the ones that do. The VEX should include the analysis and findings describing the impact (or lack of impact) that the reported vulnerability has on the product, product family, or organization
+ EXTERNAL_REFERENCE_TYPE_EXPLOITABILITY_STATEMENT = 22;
+ // Results from an authorized simulated cyberattack on a component or service, otherwise known as a penetration test
+ EXTERNAL_REFERENCE_TYPE_PENTEST_REPORT = 23;
+ // SARIF or proprietary machine or human-readable report for which static analysis has identified code quality, security, and other potential issues with the source code
+ EXTERNAL_REFERENCE_TYPE_STATIC_ANALYSIS_REPORT = 24;
+ // Dynamic analysis report that has identified issues such as vulnerabilities and misconfigurations
+ EXTERNAL_REFERENCE_TYPE_DYNAMIC_ANALYSIS_REPORT = 25;
+ // Report generated by analyzing the call stack of a running application
+ EXTERNAL_REFERENCE_TYPE_RUNTIME_ANALYSIS_REPORT = 26;
+ // Report generated by Software Composition Analysis (SCA), container analysis, or other forms of component analysis
+ EXTERNAL_REFERENCE_TYPE_COMPONENT_ANALYSIS_REPORT = 27;
+ // Report containing a formal assessment of an organization, business unit, or team against a maturity model
+ EXTERNAL_REFERENCE_TYPE_MATURITY_REPORT = 28;
+ // Industry, regulatory, or other certification from an accredited (if applicable) certification body
+ EXTERNAL_REFERENCE_TYPE_CERTIFICATION_REPORT = 29;
+ // Report or system in which quality metrics can be obtained
+ EXTERNAL_REFERENCE_TYPE_QUALITY_METRICS = 30;
+ // Code or configuration that defines and provisions virtualized infrastructure, commonly referred to as Infrastructure as Code (IaC)
+ EXTERNAL_REFERENCE_TYPE_CODIFIED_INFRASTRUCTURE = 31;
+ // A model card describes the intended uses of a machine learning model, potential limitations, biases, ethical considerations, training parameters, datasets used to train the model, performance metrics, and other relevant data useful for ML transparency.
+ EXTERNAL_REFERENCE_TYPE_MODEL_CARD = 32;
+ // Plans of Action and Milestones (POAM) complement an "attestation" external reference. POAM is defined by NIST as a "document that identifies tasks needing to be accomplished. It details resources required to accomplish the elements of the plan, any milestones in meeting the tasks and scheduled completion dates for the milestones".
+ EXTERNAL_REFERENCE_TYPE_POAM = 33;
+ // A record of events that occurred in a computer system or application, such as problems, errors, or information on current operations.
+ EXTERNAL_REFERENCE_TYPE_LOG = 34;
+ // Parameters or settings that may be used by other components or services.
+ EXTERNAL_REFERENCE_TYPE_CONFIGURATION = 35;
+ // Information used to substantiate a claim.
+ EXTERNAL_REFERENCE_TYPE_EVIDENCE = 36;
+ // Describes how a component or service was manufactured or deployed.
+ EXTERNAL_REFERENCE_TYPE_FORMULATION = 37;
+ // The location where the source code distributable can be obtained. This is often an archive format such as zip or tar.gz. The source-distribution type complements the use of the version control (vcs) type.
+ EXTERNAL_REFERENCE_TYPE_SOURCE_DISTRIBUTION = 38;
+ // An e-signature is commonly a scanned representation of a written signature or a stylized script of the person's name.
+ EXTERNAL_REFERENCE_TYPE_ELECTRONIC_SIGNATURE = 39;
+ // A signature that leverages cryptography, typically public/private key pairs, which provides strong authenticity verification.
+ EXTERNAL_REFERENCE_TYPE_DIGITAL_SIGNATURE = 40;
+ // Document that complies with RFC-9116 (A File Format to Aid in Security Vulnerability Disclosure)
+ EXTERNAL_REFERENCE_TYPE_RFC_9116 = 41;
+}
+
+enum HashAlg {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
+ HASH_ALG_NULL = 0;
+ HASH_ALG_MD_5 = 1;
+ HASH_ALG_SHA_1 = 2;
+ HASH_ALG_SHA_256 = 3;
+ HASH_ALG_SHA_384 = 4;
+ HASH_ALG_SHA_512 = 5;
+ HASH_ALG_SHA_3_256 = 6;
+ HASH_ALG_SHA_3_384 = 7;
+ HASH_ALG_SHA_3_512 = 8;
+ HASH_ALG_BLAKE_2_B_256 = 9;
+ HASH_ALG_BLAKE_2_B_384 = 10;
+ HASH_ALG_BLAKE_2_B_512 = 11;
+ HASH_ALG_BLAKE_3 = 12;
+}
+
+// Specifies the file hash of the component
+message Hash {
+ // Specifies the algorithm used to create the hash
+ HashAlg alg = 1;
+ // SimpleContent value of element
+ string value = 2;
+}
+
+message IdentifiableAction {
+ // The timestamp in which the action occurred
+ optional google.protobuf.Timestamp timestamp = 1;
+ // The name of the individual who performed the action
+ optional string name = 2;
+ // The email address of the individual who performed the action
+ optional string email = 3;
+}
+
+enum IssueClassification {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
+ ISSUE_CLASSIFICATION_NULL = 0;
+ // A fault, flaw, or bug in software
+ ISSUE_CLASSIFICATION_DEFECT = 1;
+ // A new feature or behavior in software
+ ISSUE_CLASSIFICATION_ENHANCEMENT = 2;
+ // A special type of defect which impacts security
+ ISSUE_CLASSIFICATION_SECURITY = 3;
+}
+
+message Issue {
+ // Specifies the type of issue
+ IssueClassification type = 1;
+ // The identifier of the issue assigned by the source of the issue
+ optional string id = 2;
+ // The name of the issue
+ optional string name = 3;
+ // A description of the issue
+ optional string description = 4;
+ optional Source source = 5;
+ repeated string references = 6;
+}
+
+// The source of the issue where it is documented.
+message Source {
+ // The name of the source. For example, "National Vulnerability Database", "NVD", and "Apache"
+ optional string name = 1;
+ // The url of the issue documentation as provided by the source
+ optional string url = 2;
+}
+
+message LicenseChoice {
+ oneof choice {
+ License license = 1;
+ // A valid SPDX license expression. Refer to https://spdx.org/specifications for syntax requirements
+ string expression = 2;
+ }
+ // This field must only be used when "expression" is chosen as the License object has its own acknowledgement.
+ optional LicenseAcknowledgementEnumeration acknowledgement = 3;
+}
+
+message License {
+ oneof license {
+ // A valid SPDX license ID
+ string id = 1;
+ // If SPDX does not define the license used, this field may be used to provide the license name
+ string name = 2;
+ }
+ // Specifies the optional full text of the attachment
+ optional AttachedText text = 3;
+ // The URL to the attachment file. If the attachment is a license or BOM, an externalReference should also be specified for completeness.
+ optional string url = 4;
+ // An optional identifier which can be used to reference the license elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 5;
+ // Licensing details describing the licensor/licensee, license type, renewal and expiration dates, and other important metadata
+ optional Licensing licensing = 6;
+ // Specifies optional, custom, properties
+ repeated Property properties = 7;
+ // Declared licenses and concluded licenses represent two different stages in the licensing process within software development. Declared licenses refer to the initial intention of the software authors regarding the licensing terms under which their code is released. On the other hand, concluded licenses are the result of a comprehensive analysis of the project's codebase to identify and confirm the actual licenses of the components used, which may differ from the initially declared licenses. While declared licenses provide an upfront indication of the licensing intentions, concluded licenses offer a more thorough understanding of the actual licensing within a project, facilitating proper compliance and risk management. Observed licenses are defined in `@.evidence.licenses`. Observed licenses form the evidence necessary to substantiate a concluded license.
+ optional LicenseAcknowledgementEnumeration acknowledgement = 8;
+}
+
+// Declared licenses and concluded licenses represent two different stages in the licensing process within software development. Declared licenses refer to the initial intention of the software authors regarding the licensing terms under which their code is released. On the other hand, concluded licenses are the result of a comprehensive analysis of the project's codebase to identify and confirm the actual licenses of the components used, which may differ from the initially declared licenses. While declared licenses provide an upfront indication of the licensing intentions, concluded licenses offer a more thorough understanding of the actual licensing within a project, facilitating proper compliance and risk management. Observed licenses are defined in `@.evidence.licenses`. Observed licenses form the evidence necessary to substantiate a concluded license.
+enum LicenseAcknowledgementEnumeration {
+ // The license acknowledgement is not specified.
+ LICENSE_ACKNOWLEDGEMENT_ENUMERATION_UNSPECIFIED = 0;
+ // Declared licenses represent the initial intentions of authors regarding the licensing terms of their code.
+ LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED = 1;
+ // Concluded licenses are verified and confirmed.
+ LICENSE_ACKNOWLEDGEMENT_ENUMERATION_CONCLUDED = 2;
+}
+
+message Licensing {
+ // License identifiers that may be used to manage licenses and their lifecycle
+ repeated string altIds = 1;
+ // The individual or organization that grants a license to another individual or organization
+ optional OrganizationalEntityOrContact licensor = 2;
+ // The individual or organization for which a license was granted to
+ optional OrganizationalEntityOrContact licensee = 3;
+ // The individual or organization that purchased the license
+ optional OrganizationalEntityOrContact purchaser = 4;
+ // The purchase order identifier the purchaser sent to a supplier or vendor to authorize a purchase
+ optional string purchaseOrder = 5;
+ // The type of license(s) that was granted to the licensee
+ repeated LicensingTypeEnum licenseTypes = 6;
+ // The timestamp indicating when the license was last renewed. For new purchases, this is often the purchase or acquisition date. For non-perpetual licenses or subscriptions, this is the timestamp of when the license was last renewed.
+ optional google.protobuf.Timestamp lastRenewal = 7;
+ // The timestamp indicating when the current license expires (if applicable).
+ optional google.protobuf.Timestamp expiration = 8;
+}
+
+message OrganizationalEntityOrContact {
+ oneof choice {
+ OrganizationalEntity organization = 1;
+ OrganizationalContact individual = 2;
+ }
+}
+
+// buf:lint:ignore ENUM_VALUE_PREFIX -- Enum value names should be prefixed with "LICENSING_TYPE_ENUM_"
+enum LicensingTypeEnum {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
+ LICENSING_TYPE_NULL = 0;
+ // A license that grants use of software solely for the purpose of education or research.
+ LICENSING_TYPE_ACADEMIC = 1;
+ // A license covering use of software embedded in a specific piece of hardware.
+ LICENSING_TYPE_APPLIANCE = 2;
+ // A Client Access License (CAL) allows client computers to access services provided by server software.
+ LICENSING_TYPE_CLIENT_ACCESS = 3;
+ // A Concurrent User license (aka floating license) limits the number of licenses for a software application and licenses are shared among a larger number of users.
+ LICENSING_TYPE_CONCURRENT_USER = 4;
+ // A license where the core of a computer's processor is assigned a specific number of points.
+ LICENSING_TYPE_CORE_POINTS = 5;
+ // A license for which consumption is measured by non-standard metrics.
+ LICENSING_TYPE_CUSTOM_METRIC = 6;
+ // A license that covers a defined number of installations on computers and other types of devices.
+ LICENSING_TYPE_DEVICE = 7;
+ // A license that grants permission to install and use software for trial purposes.
+ LICENSING_TYPE_EVALUATION = 8;
+ // A license that grants access to the software to one or more pre-defined users.
+ LICENSING_TYPE_NAMED_USER = 9;
+ // A license that grants access to the software on one or more pre-defined computers or devices.
+ LICENSING_TYPE_NODE_LOCKED = 10;
+ // An Original Equipment Manufacturer license that is delivered with hardware, cannot be transferred to other hardware, and is valid for the life of the hardware.
+ LICENSING_TYPE_OEM = 11;
+ // A license where the software is sold on a one-time basis and the licensee can use a copy of the software indefinitely.
+ LICENSING_TYPE_PERPETUAL = 12;
+ // A license where each installation consumes points per processor.
+ LICENSING_TYPE_PROCESSOR_POINTS = 13;
+ // A license where the licensee pays a fee to use the software or service.
+ LICENSING_TYPE_SUBSCRIPTION = 14;
+ // A license that grants access to the software or service by a specified number of users.
+ LICENSING_TYPE_USER = 15;
+ // Another license type.
+ LICENSING_TYPE_OTHER = 16;
+}
+
+message Metadata {
+ // The date and time (timestamp) when the document was created.
+ optional google.protobuf.Timestamp timestamp = 1;
+ // The tool(s) used in the creation of the BOM.
+ optional Tool tools = 2;
+ // The person(s) who created the BOM. Authors are common in BOMs created through manual processes. BOMs created through automated means may have '.manufacturer' instead.
+ repeated OrganizationalContact authors = 3;
+ // The component that the BOM describes.
+ optional Component component = 4;
+ // DEPRECATED - DO NOT USE - This will be removed in a future version - Use the `.component.manufacturer` instead. The organization that manufactured the component that the BOM describes.
+ optional OrganizationalEntity manufacture = 5 [deprecated = true];
+ // The organization that supplied the component that the BOM describes. The supplier may often be the manufacture, but may also be a distributor or repackager.
+ optional OrganizationalEntity supplier = 6;
+ // The license information for the BOM document. This may be different from the license(s) of the component(s) that the BOM describes.
+ // EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)
+ repeated LicenseChoice licenses = 7;
+ // Specifies optional, custom, properties
+ repeated Property properties = 8;
+ // Lifecycles communicate the stage(s) in which data in the BOM was captured. Different types of data may be available at various phases of a lifecycle, such as the Software Development Lifecycle (SDLC), IT Asset Management (ITAM), and Software Asset Management (SAM). Thus, a BOM may include data specific to or only obtainable in a given lifecycle.
+ repeated Lifecycles lifecycles = 9;
+ // The organization that created the BOM. Manufacturer is common in BOMs created through automated processes. BOMs created through manual means may have '.authors' instead.
+ optional OrganizationalEntity manufacturer = 10;
+}
+
+message Lifecycles {
+ oneof choice {
+ // A pre-defined phase in the product lifecycle.
+ LifecyclePhase phase = 1;
+ // The name of the lifecycle phase
+ string name = 2;
+ }
+ // The description of the lifecycle phase
+ optional string description = 3;
+}
+
+enum LifecyclePhase {
+ // BOM produced early in the development lifecycle containing an inventory of components and services that are proposed or planned to be used. The inventory may need to be procured, retrieved, or resourced prior to use.
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- value `0` is a fallback(meaning "unspecified") in protobuf3. this usage here is an error; it shall be fixed with v2.0 of this very schema
+ LIFECYCLE_PHASE_DESIGN = 0;
+ // BOM consists of information obtained prior to a build process and may contain source files, development artifacts, and manifests. The inventory may need to be resolved and retrieved prior to use.
+ LIFECYCLE_PHASE_PRE_BUILD = 1;
+ // BOM consisting of information obtained during a build process where component inventory is available for use. The precise versions of resolved components are usually available at this time as well as the provenance of where the components were retrieved from.
+ LIFECYCLE_PHASE_BUILD = 2;
+ // BOM consisting of information obtained after a build process has completed and the resulting components(s) are available for further analysis. Built components may exist as the result of a CI/CD process, may have been installed or deployed to a system or device, and may need to be retrieved or extracted from the system or device.
+ LIFECYCLE_PHASE_POST_BUILD = 3;
+ // BOM produced that represents inventory that is running and operational. This may include staging or production environments and will generally encompass multiple SBOMs describing the applications and operating system, along with HBOMs describing the hardware that makes up the system. Operations Bill of Materials (OBOM) can provide full-stack inventory of runtime environments, configurations, and additional dependencies.
+ LIFECYCLE_PHASE_OPERATIONS = 4;
+ // BOM consisting of information observed through network discovery providing point-in-time enumeration of embedded, on-premise, and cloud-native services such as server applications, connected devices, microservices, and serverless functions.
+ LIFECYCLE_PHASE_DISCOVERY = 5;
+ // BOM containing inventory that will be, or has been retired from operations.
+ LIFECYCLE_PHASE_DECOMMISSION = 6;
+}
+
+message OrganizationalContact {
+ // The name of the contact
+ optional string name = 1;
+ // The email address of the contact.
+ optional string email = 2;
+ // The phone number of the contact.
+ optional string phone = 3;
+ // An optional identifier which can be used to reference the object elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 4;
+}
+
+message OrganizationalEntity {
+ // The name of the organization
+ optional string name = 1;
+ // The URL of the organization. Multiple URLs are allowed.
+ repeated string url = 2;
+ // A contact person at the organization. Multiple contacts are allowed.
+ repeated OrganizationalContact contact = 3;
+ // An optional identifier which can be used to reference the object elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 4;
+ // The physical address (location) of the organization
+ optional PostalAddressType address = 5;
+}
+
+enum PatchClassification {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
+ PATCH_CLASSIFICATION_NULL = 0;
+ // A patch which is not developed by the creators or maintainers of the software being patched. Refer to https://en.wikipedia.org/wiki/Unofficial_patch
+ PATCH_CLASSIFICATION_UNOFFICIAL = 1;
+ // A patch which dynamically modifies runtime behavior. Refer to https://en.wikipedia.org/wiki/Monkey_patch
+ PATCH_CLASSIFICATION_MONKEY = 2;
+ // A patch which takes code from a newer version of software and applies it to older versions of the same software. Refer to https://en.wikipedia.org/wiki/Backporting
+ PATCH_CLASSIFICATION_BACKPORT = 3;
+ // A patch created by selectively applying commits from other versions or branches of the same software.
+ PATCH_CLASSIFICATION_CHERRY_PICK = 4;
+}
+
+message Patch {
+ // Specifies the purpose for the patch, including the resolution of defects, security issues, or new behavior or functionality
+ PatchClassification type = 1;
+ // The patch file (or diff) that show changes. Refer to https://en.wikipedia.org/wiki/Diff
+ optional Diff diff = 2;
+ repeated Issue resolves = 3;
+}
+
+// Component pedigree is a way to document complex supply chain scenarios where components are created, distributed, modified, redistributed, combined with other components, etc. Pedigree supports viewing this complex chain from the beginning, the end, or anywhere in the middle. It also provides a way to document variants where the exact relation may not be known.
+message Pedigree {
+ // Describes zero or more components in which a component is derived from. This is commonly used to describe forks from existing projects where the forked version contains an ancestor node containing the original component it was forked from. For example, Component A is the original component. Component B is the component being used and documented in the BOM. However, Component B contains a pedigree node with a single ancestor documenting Component A - the original component from which Component B is derived from.
+ repeated Component ancestors = 1;
+ // Descendants are the exact opposite of ancestors. This provides a way to document all forks (and their forks) of an original or root component.
+ repeated Component descendants = 2;
+ // Variants describe relations where the relationship between the components is not known. For example, if Component A contains nearly identical code to Component B. They are both related, but it is unclear if one is derived from the other or if they share a common ancestor.
+ repeated Component variants = 3;
+ // A list of zero or more commits which provide a trail describing how the component deviates from an ancestor, descendant, or variant.
+ repeated Commit commits = 4;
+ // A list of zero or more patches describing how the component deviates from an ancestor, descendant, or variant. Patches may be complementary to commits or may be used in place of commits.
+ repeated Patch patches = 5;
+ // Notes, observations, and other non-structured commentary describing the component's pedigree.
+ optional string notes = 6;
+}
+
+enum Scope {
+ // Default
+ SCOPE_UNSPECIFIED = 0;
+ // The component is required for runtime
+ SCOPE_REQUIRED = 1;
+ // The component is optional at runtime. Optional components are components that are not capable of being called due to them not being installed or otherwise accessible by any means. Components that are installed but, due to configuration or other restrictions, are prohibited from being called must be scoped as 'required'.
+ SCOPE_OPTIONAL = 2;
+ // Components that are excluded provide the ability to document component usage for test and other non-runtime purposes. Excluded components are not reachable within a call graph at runtime.
+ SCOPE_EXCLUDED = 3;
+}
+
+message Service {
+ // An optional identifier which can be used to reference the service elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 1;
+ // The organization that provides the service.
+ optional OrganizationalEntity provider = 2;
+ // The grouping name, namespace, or identifier. This will often be a shortened, single name of the company or project that produced the service or domain name. Whitespace and special characters should be avoided.
+ optional string group = 3;
+ // The name of the service. This will often be a shortened, single name of the service.
+ string name = 4;
+ // The service version.
+ optional string version = 5;
+ // Specifies a description for the service.
+ optional string description = 6;
+ repeated string endpoints = 7;
+ // A boolean value indicating if the service requires authentication. A value of true indicates the service requires authentication prior to use. A value of false indicates the service does not require authentication.
+ optional bool authenticated = 8;
+ // A boolean value indicating if the use of the service crosses a trust zone or boundary. A value of true indicates that by using the service, a trust boundary is crossed. A value of false indicates that by using the service, a trust boundary is not crossed.
+ optional bool x_trust_boundary = 9;
+ repeated DataFlow data = 10;
+ // EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)
+ repeated LicenseChoice licenses = 11;
+ // Provides the ability to document external references related to the service.
+ repeated ExternalReference external_references = 12;
+ // Specifies optional sub-service. This is not a dependency tree. It provides a way to specify a hierarchical representation of service assemblies, similar to system -> subsystem -> parts assembly in physical supply chains.
+ repeated Service services = 13;
+ // Specifies optional, custom, properties
+ repeated Property properties = 14;
+ // Specifies optional release notes.
+ optional ReleaseNotes releaseNotes = 15;
+ // The name of the trust zone the service resides in.
+ optional string trustZone = 16;
+ // Textual strings that aid in the discovery, search, and retrieval of the associated object. Tags often serve as a way to group or categorize similar or related objects by various attributes. Examples include "json-parser", "object-persistence", "text-to-image", "translation", and "object-detection".
+ repeated string tags = 17;
+}
+
+message Swid {
+ // Maps to the tagId of a SoftwareIdentity.
+ string tag_id = 1;
+ // Maps to the name of a SoftwareIdentity.
+ string name = 2;
+ // Maps to the version of a SoftwareIdentity. Defaults to '0.0' if not specified.
+ optional string version = 3;
+ // Maps to the tagVersion of a SoftwareIdentity. Defaults to '0' if not specified.
+ optional int32 tag_version = 4;
+ // Maps to the patch of a SoftwareIdentity. Defaults to 'false' if not specified.
+ optional bool patch = 5;
+ // Specifies the full content of the SWID tag.
+ optional AttachedText text = 6;
+ // The URL to the SWID file.
+ optional string url = 7;
+}
+
+// Specifies a tool (manual or automated).
+message Tool {
+ // DEPRECATED - DO NOT USE - The vendor of the tool used to create the BOM.
+ optional string vendor = 1 [deprecated = true];
+ // DEPRECATED - DO NOT USE - The name of the tool used to create the BOM.
+ optional string name = 2 [deprecated = true];
+ // DEPRECATED - DO NOT USE - The version of the tool used to create the BOM.
+ optional string version = 3 [deprecated = true];
+ // DEPRECATED - DO NOT USE
+ repeated Hash hashes = 4 [deprecated = true];
+ // DEPRECATED - DO NOT USE - Provides the ability to document external references related to the tool.
+ repeated ExternalReference external_references = 5 [deprecated = true];
+ // A list of software and hardware components used as tools
+ repeated Component components = 6;
+ // A list of services used as tools. This may include microservices, function-as-a-service, and other types of network or intra-process services.
+ repeated Service services = 7;
+}
+
+// Specifies a property
+message Property {
+ string name = 1;
+ optional string value = 2;
+}
+
+enum Aggregate {
+ // The relationship completeness is not specified.
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `not specified` is our fallback, doubling `unspecified`
+ AGGREGATE_NOT_SPECIFIED = 0;
+ // The relationship is complete. No further relationships including constituent components, services, or dependencies are known to exist.
+ AGGREGATE_COMPLETE = 1;
+ // The relationship is incomplete. Additional relationships exist and may include constituent components, services, or dependencies.
+ AGGREGATE_INCOMPLETE = 2;
+ // The relationship is incomplete. Only relationships for first-party components, services, or their dependencies are represented.
+ AGGREGATE_INCOMPLETE_FIRST_PARTY_ONLY = 3;
+ // The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented.
+ AGGREGATE_INCOMPLETE_THIRD_PARTY_ONLY = 4;
+ // The relationship may be complete or incomplete. This usually signifies a 'best-effort' to obtain constituent components, services, or dependencies but the completeness is inconclusive.
+ AGGREGATE_UNKNOWN = 5;
+ // The relationship is incomplete. Only relationships for first-party components, services, or their dependencies are represented, limited specifically to those that are proprietary.
+ AGGREGATE_INCOMPLETE_FIRST_PARTY_PROPRIETARY_ONLY = 6;
+ // The relationship is incomplete. Only relationships for first-party components, services, or their dependencies are represented, limited specifically to those that are opensource.
+ AGGREGATE_INCOMPLETE_FIRST_PARTY_OPENSOURCE_ONLY = 7;
+ // The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are proprietary.
+ AGGREGATE_INCOMPLETE_THIRD_PARTY_PROPRIETARY_ONLY = 8;
+ // The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are opensource.
+ AGGREGATE_INCOMPLETE_THIRD_PARTY_OPENSOURCE_ONLY = 9;
+}
+
+message Composition {
+ // Indicates the aggregate completeness
+ Aggregate aggregate = 1;
+ // The assemblies the aggregate completeness applies to
+ repeated string assemblies = 2;
+ // The dependencies the aggregate completeness applies to
+ repeated string dependencies = 3;
+ // The bom-ref identifiers of the vulnerabilities being described.
+ repeated string vulnerabilities = 4;
+ // An optional identifier which can be used to reference the composition elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ optional string bom_ref = 5;
+}
+
+message EvidenceCopyright {
+ // Copyright text
+ string text = 1;
+}
+
+message Evidence {
+ // EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)
+ repeated LicenseChoice licenses = 1;
+ repeated EvidenceCopyright copyright = 2;
+ repeated EvidenceIdentity identity = 3;
+ repeated EvidenceOccurrences occurrences = 4;
+ optional Callstack callstack = 5;
+}
+
+// Evidence of the components use through the callstack.
+message Callstack {
+ repeated Frames frames = 1;
+
+ message Frames {
+ // A package organizes modules into namespaces, providing a unique namespace for each type it contains.
+ optional string package = 1;
+ // A module or class that encloses functions/methods and other code.
+ string module = 2;
+ // A block of code designed to perform a particular task.
+ optional string function = 3;
+ // Optional arguments that are passed to the module or function.
+ repeated string parameters = 4;
+ // The line number the code that is called resides on.
+ optional int32 line = 5;
+ // The column the code that is called resides.
+ optional int32 column = 6;
+ // The full path and filename of the module.
+ optional string fullFilename = 7;
+ }
+}
+
+message EvidenceIdentity {
+ // The identity field of the component which the evidence describes.
+ EvidenceFieldType field = 1;
+ // The overall confidence of the evidence from 0 - 1, where 1 is 100% confidence.
+ optional float confidence = 2;
+ // The methods used to extract and/or analyze the evidence.
+ repeated EvidenceMethods methods = 3;
+ // The object in the BOM identified by its bom-ref. This is often a component or service, but may be any object type supporting bom-refs. Tools used for analysis should already be defined in the BOM, either in the metadata/tools, components, or formulation.
+ repeated string tools = 4;
+ // The value of the field (cpe, purl, etc) that has been concluded based on the aggregate of all methods (if available).
+ optional string concludedValue = 5;
+}
+
+message EvidenceMethods {
+ // The technique used in this method of analysis.
+ EvidenceTechnique technique = 1;
+ // The confidence of the evidence from 0 - 1, where 1 is 100% confidence. Confidence is specific to the technique used. Each technique of analysis can have independent confidence.
+ float confidence = 2;
+ // The value or contents of the evidence.
+ optional string value = 3;
+}
+
+message EvidenceOccurrences {
+ // An optional identifier which can be used to reference the occurrence elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ optional string bom_ref = 1;
+ // The location or path to where the component was found.
+ string location = 2;
+ // The line number where the component was found.
+ optional int32 line = 3;
+ // The offset where the component was found.
+ optional int32 offset = 4;
+ // The symbol name that was found associated with the component.
+ optional string symbol = 5;
+ // Any additional context of the detected component (e.g. a code snippet).
+ optional string additionalContext = 6;
+}
+
+// buf:lint:ignore ENUM_VALUE_PREFIX -- Enum value names should be prefixed with "EVIDENCE_FIELD_TYPE_"
+enum EvidenceFieldType {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
+ EVIDENCE_FIELD_NULL = 0;
+ EVIDENCE_FIELD_GROUP = 1;
+ EVIDENCE_FIELD_NAME = 2;
+ EVIDENCE_FIELD_VERSION = 3;
+ EVIDENCE_FIELD_PURL = 4;
+ EVIDENCE_FIELD_CPE = 5;
+ EVIDENCE_FIELD_SWID = 6;
+ EVIDENCE_FIELD_HASH = 7;
+ EVIDENCE_FIELD_OMNIBOR_ID = 8;
+ EVIDENCE_FIELD_SWHID = 9;
+}
+
+enum EvidenceTechnique {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- value `0` is a fallback(meaning "unspecified") in protobuf3. this usage here is an error, it shall be fixed with v2.0 of this very schema
+ EVIDENCE_TECHNIQUE_SOURCE_CODE_ANALYSIS = 0;
+ EVIDENCE_TECHNIQUE_BINARY_ANALYSIS = 1;
+ EVIDENCE_TECHNIQUE_MANIFEST_ANALYSIS = 2;
+ EVIDENCE_TECHNIQUE_AST_FINGERPRINT = 3;
+ EVIDENCE_TECHNIQUE_HASH_COMPARISON = 4;
+ EVIDENCE_TECHNIQUE_INSTRUMENTATION = 5;
+ EVIDENCE_TECHNIQUE_DYNAMIC_ANALYSIS = 6;
+ EVIDENCE_TECHNIQUE_FILENAME = 7;
+ EVIDENCE_TECHNIQUE_ATTESTATION = 8;
+ EVIDENCE_TECHNIQUE_OTHER = 9;
+}
+
+message Note {
+ // The ISO-639 (or higher) language code and optional ISO-3166 (or higher) country code. Examples include: "en", "en-US", "fr" and "fr-CA".
+ optional string locale = 1;
+ // Specifies the full content of the release note.
+ optional AttachedText text = 2;
+}
+
+message ReleaseNotes {
+ // The software versioning type. It is RECOMMENDED that the release type use one of 'major', 'minor', 'patch', 'pre-release', or 'internal'. Representing all possible software release types is not practical, so standardizing on the recommended values, whenever possible, is strongly encouraged.
+ string type = 1;
+ // The title of the release.
+ optional string title = 2;
+ // The URL to an image that may be prominently displayed with the release note.
+ optional string featuredImage = 3;
+ // The URL to an image that may be used in messaging on social media platforms.
+ optional string socialImage = 4;
+ // A short description of the release.
+ optional string description = 5;
+ // The date and time (timestamp) when the release note was created.
+ optional google.protobuf.Timestamp timestamp = 6;
+ // Optional alternate names the release may be referred to. This may include unofficial terms used by development and marketing teams (e.g. code names).
+ repeated string aliases = 7;
+ // Textual strings that aid in the discovery, search, and retrieval of the associated object. Tags often serve as a way to group or categorize similar or related objects by various attributes. Examples include "json-parser", "object-persistence", "text-to-image", "translation", and "object-detection".
+ repeated string tags = 8;
+ // A collection of issues that have been resolved.
+ repeated Issue resolves = 9;
+ // Zero or more release notes containing the locale and content. Multiple note messages may be specified to support release notes in a wide variety of languages.
+ repeated Note notes = 10;
+ // Specifies optional, custom, properties
+ repeated Property properties = 11;
+}
+
+message Vulnerability {
+ // An optional identifier which can be used to reference the vulnerability elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 1;
+ // The identifier that uniquely identifies the vulnerability.
+ optional string id = 2;
+ // The source that published the vulnerability.
+ optional Source source = 3;
+ // Zero or more pointers to vulnerabilities that are the equivalent of the vulnerability specified. Oftentimes, the same vulnerability may exist in multiple sources of vulnerability intelligence but have different identifiers. References provide a way to correlate vulnerabilities across multiple sources of vulnerability intelligence.
+ repeated VulnerabilityReference references = 4;
+ // List of vulnerability ratings
+ repeated VulnerabilityRating ratings = 5;
+ // List of Common Weaknesses Enumerations (CWEs) codes that describe this vulnerability. For example, 399 (of https://cwe.mitre.org/data/definitions/399.html)
+ repeated int32 cwes = 6;
+ // A description of the vulnerability as provided by the source.
+ optional string description = 7;
+ // If available, an in-depth description of the vulnerability as provided by the source organization. Details often include information useful in understanding the root cause.
+ optional string detail = 8;
+ // Recommendations of how the vulnerability can be remediated or mitigated.
+ optional string recommendation = 9;
+ // Published advisories of the vulnerability if provided.
+ repeated Advisory advisories = 10;
+ // The date and time (timestamp) when the vulnerability record was created in the vulnerability database.
+ optional google.protobuf.Timestamp created = 11;
+ // The date and time (timestamp) when the vulnerability record was first published.
+ optional google.protobuf.Timestamp published = 12;
+ // The date and time (timestamp) when the vulnerability record was last updated.
+ optional google.protobuf.Timestamp updated = 13;
+ // Individuals or organizations credited with the discovery of the vulnerability.
+ optional VulnerabilityCredits credits = 14;
+ // The tool(s) used to identify, confirm, or score the vulnerability.
+ optional Tool tools = 15;
+ // An assessment of the impact and exploitability of the vulnerability.
+ optional VulnerabilityAnalysis analysis = 16;
+ // affects
+ repeated VulnerabilityAffects affects = 17;
+ // Specifies optional, custom, properties
+ repeated Property properties = 18;
+ // The date and time (timestamp) when the vulnerability record was rejected (if applicable).
+ optional google.protobuf.Timestamp rejected = 19;
+ // Evidence used to reproduce the vulnerability.
+ optional ProofOfConcept proofOfConcept = 20;
+ // A bypass, usually temporary, of the vulnerability that reduces its likelihood and/or impact. Workarounds often involve changes to configuration or deployments.
+ optional string workaround = 21;
+}
+
+message ProofOfConcept {
+ // Precise steps to reproduce the vulnerability.
+ optional string reproductionSteps = 1;
+ // A description of the environment in which reproduction was possible.
+ optional string environment = 2;
+ // Supporting material that helps in reproducing or understanding how reproduction is possible. This may include screenshots, payloads, and PoC exploit code.
+ repeated AttachedText supportingMaterial = 3;
+}
+
+message VulnerabilityReference {
+ // An identifier that uniquely identifies the vulnerability.
+ string id = 1;
+ // The source that published the vulnerability.
+ Source source = 2;
+}
+
+message VulnerabilityRating {
+ // The source that calculated the severity or risk rating of the vulnerability.
+ optional Source source = 1;
+ // The numerical score of the rating.
+ optional double score = 2;
+ // Textual representation of the severity that corresponds to the numerical score of the rating.
+ optional Severity severity = 3;
+ // Specifies the severity or risk scoring methodology or standard used.
+ optional ScoreMethod method = 4;
+ // Textual representation of the metric values used to score the vulnerability.
+ optional string vector = 5;
+ // An optional reason for rating the vulnerability as it was.
+ optional string justification = 6;
+}
+
+enum Severity {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `unknown` is our fallback, doubling `unspecified`
+ SEVERITY_UNKNOWN = 0;
+ SEVERITY_CRITICAL = 1;
+ SEVERITY_HIGH = 2;
+ SEVERITY_MEDIUM = 3;
+ SEVERITY_LOW = 4;
+ SEVERITY_INFO = 5;
+ SEVERITY_NONE = 6;
+}
+
+enum ScoreMethod {
+ // An undefined score method
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
+ SCORE_METHOD_NULL = 0;
+ // Common Vulnerability Scoring System v2 - https://www.first.org/cvss/v2/
+ SCORE_METHOD_CVSSV2 = 1;
+ // Common Vulnerability Scoring System v3 - https://www.first.org/cvss/v3-0/
+ SCORE_METHOD_CVSSV3 = 2;
+ // Common Vulnerability Scoring System v3.1 - https://www.first.org/cvss/v3-1/
+ SCORE_METHOD_CVSSV31 = 3;
+ // OWASP Risk Rating Methodology - https://owasp.org/www-community/OWASP_Risk_Rating_Methodology
+ SCORE_METHOD_OWASP = 4;
+ // Other scoring method
+ SCORE_METHOD_OTHER = 5;
+ // Common Vulnerability Scoring System v4.0 - https://www.first.org/cvss/v4-0/
+ SCORE_METHOD_CVSSV4 = 6;
+ // Stakeholder Specific Vulnerability Categorization (all versions) - https://github.com/CERTCC/SSVC
+ SCORE_METHOD_SSVC = 7;
+}
+
+message Advisory {
+ // An optional name of the advisory.
+ optional string title = 1;
+ // Location where the advisory can be obtained.
+ string url = 2;
+}
+
+message VulnerabilityCredits {
+ // The organizations credited with vulnerability discovery.
+ repeated OrganizationalEntity organizations = 1;
+ // The individuals not associated with organizations that are credited with vulnerability discovery.
+ repeated OrganizationalContact individuals = 2;
+}
+
+message VulnerabilityAnalysis {
+ // Declares the current state of an occurrence of a vulnerability after automated or manual analysis.
+ optional ImpactAnalysisState state = 1;
+ // The rationale of why the impact analysis state was asserted.
+ optional ImpactAnalysisJustification justification = 2;
+ // A response to the vulnerability by the manufacturer, supplier, or project responsible for the affected component or service. More than one response is allowed. Responses are strongly encouraged for vulnerabilities where the analysis state is exploitable.
+ repeated VulnerabilityResponse response = 3;
+ // Detailed description of the impact, including methods used during the assessment. If a vulnerability is not exploitable, this field should include specific details on why the component or service is not impacted by this vulnerability.
+ optional string detail = 4;
+ // The date and time (timestamp) when the analysis was first issued.
+ optional google.protobuf.Timestamp firstIssued = 5;
+ // The date and time (timestamp) when the analysis was last updated.
+ optional google.protobuf.Timestamp lastUpdated = 6;
+}
+
+enum ImpactAnalysisState {
+ // An undefined impact analysis state
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
+ IMPACT_ANALYSIS_STATE_NULL = 0;
+ // The vulnerability has been remediated.
+ IMPACT_ANALYSIS_STATE_RESOLVED = 1;
+ // The vulnerability has been remediated, and evidence of the changes is provided in the affected components pedigree containing verifiable commit history and/or diff(s).
+ IMPACT_ANALYSIS_STATE_RESOLVED_WITH_PEDIGREE = 2;
+ // The vulnerability may be directly or indirectly exploitable.
+ IMPACT_ANALYSIS_STATE_EXPLOITABLE = 3;
+ // The vulnerability is being investigated.
+ IMPACT_ANALYSIS_STATE_IN_TRIAGE = 4;
+ // The vulnerability is not specific to the component or service and was falsely identified or associated.
+ IMPACT_ANALYSIS_STATE_FALSE_POSITIVE = 5;
+ // The component or service is not affected by the vulnerability. Justification should be specified for all not_affected cases.
+ IMPACT_ANALYSIS_STATE_NOT_AFFECTED = 6;
+}
+
+enum ImpactAnalysisJustification {
+ // An undefined impact analysis justification
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
+ IMPACT_ANALYSIS_JUSTIFICATION_NULL = 0;
+ // The code has been removed or tree-shaked.
+ IMPACT_ANALYSIS_JUSTIFICATION_CODE_NOT_PRESENT = 1;
+ // The vulnerable code is not invoked at runtime.
+ IMPACT_ANALYSIS_JUSTIFICATION_CODE_NOT_REACHABLE = 2;
+ // Exploitability requires a configurable option to be set/unset.
+ IMPACT_ANALYSIS_JUSTIFICATION_REQUIRES_CONFIGURATION = 3;
+ // Exploitability requires a dependency that is not present.
+ IMPACT_ANALYSIS_JUSTIFICATION_REQUIRES_DEPENDENCY = 4;
+ // Exploitability requires a certain environment which is not present.
+ IMPACT_ANALYSIS_JUSTIFICATION_REQUIRES_ENVIRONMENT = 5;
+ // Exploitability requires a compiler flag to be set/unset.
+ IMPACT_ANALYSIS_JUSTIFICATION_PROTECTED_BY_COMPILER = 6;
+ // Exploits are prevented at runtime.
+ IMPACT_ANALYSIS_JUSTIFICATION_PROTECTED_AT_RUNTIME = 7;
+ // Attacks are blocked at physical, logical, or network perimeter.
+ IMPACT_ANALYSIS_JUSTIFICATION_PROTECTED_AT_PERIMETER = 8;
+ // Preventative measures have been implemented that reduce the likelihood and/or impact of the vulnerability.
+ IMPACT_ANALYSIS_JUSTIFICATION_PROTECTED_BY_MITIGATING_CONTROL = 9;
+}
+
+enum VulnerabilityResponse {
+ // unspecified value
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
+ VULNERABILITY_RESPONSE_NULL = 0;
+ VULNERABILITY_RESPONSE_CAN_NOT_FIX = 1;
+ VULNERABILITY_RESPONSE_WILL_NOT_FIX = 2;
+ VULNERABILITY_RESPONSE_UPDATE = 3;
+ VULNERABILITY_RESPONSE_ROLLBACK = 4;
+ VULNERABILITY_RESPONSE_WORKAROUND_AVAILABLE = 5;
+}
+
+message VulnerabilityAffects {
+ // References a component or service by the objects bom-ref
+ string ref = 1;
+ // Zero or more individual versions or range of versions.
+ repeated VulnerabilityAffectedVersions versions = 2;
+}
+
+message VulnerabilityAffectedVersions {
+ oneof choice {
+ // A single version of a component or service.
+ string version = 1;
+ // A version range specified in Package URL Version Range syntax (vers), which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst
+ string range = 2;
+ }
+ // The vulnerability status for the version or range of versions. Defaults to VULNERABILITY_AFFECTED_STATUS_AFFECTED if not specified.
+ optional VulnerabilityAffectedStatus status = 3;
+}
+
+// The vulnerability status of a given version or range of versions of a product. The statuses 'affected' and 'unaffected' indicate that the version is affected or unaffected by the vulnerability. The status 'unknown' indicates that it is unknown or unspecified whether the given version is affected. There can be many reasons for an 'unknown' status, including that an investigation has not been undertaken or that a vendor has not disclosed the status.
+enum VulnerabilityAffectedStatus {
+ // It is unknown (or unspecified) whether the given version is affected.
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `unknown` is our fallback, doubling `unspecified`
+ VULNERABILITY_AFFECTED_STATUS_UNKNOWN = 0;
+ VULNERABILITY_AFFECTED_STATUS_AFFECTED = 1;
+ VULNERABILITY_AFFECTED_STATUS_NOT_AFFECTED = 2;
+}
+
+message AnnotatorChoice {
+ oneof choice {
+ // The organization that created the annotation
+ OrganizationalEntity organization = 1;
+ // The person that created the annotation
+ OrganizationalContact individual = 2;
+ // The tool or component that created the annotation
+ Component component = 3;
+ // The service that created the annotation
+ Service service = 4;
+ }
+}
+
+message Annotation {
+ // An optional identifier which can be used to reference the annotation elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ optional string bom_ref = 1;
+ // The object in the BOM identified by its bom-ref. This is often a component or service but may be any object type supporting bom-refs.
+ repeated string subjects = 2;
+ // The organization, person, component, or service which created the textual content of the annotation.
+ AnnotatorChoice annotator = 3;
+ // The date and time (timestamp) when the annotation was created.
+ google.protobuf.Timestamp timestamp = 4;
+ // The textual content of the annotation.
+ string text = 5;
+}
+
+message ModelCard {
+ // An optional identifier which can be used to reference the model card elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ optional string bom_ref = 1;
+ // Hyper-parameters for construction of the model.
+ optional ModelParameters modelParameters = 2;
+ // A quantitative analysis of the model
+ optional QuantitativeAnalysis quantitativeAnalysis = 3;
+ // What considerations should be taken into account regarding the model's construction, training, and application?
+ optional ModelCardConsiderations considerations = 4;
+
+ message ModelParameters {
+ // The overall approach to learning used by the model for problem-solving.
+ optional Approach approach = 1;
+ // Directly influences the input and/or output. Examples include classification, regression, clustering, etc.
+ optional string task = 2;
+ // The model architecture family such as transformer network, convolutional neural network, residual neural network, LSTM neural network, etc.
+ optional string architectureFamily = 3;
+ //The specific architecture of the model, such as GPT-1, ResNet-50, YOLOv3, etc.
+ optional string modelArchitecture = 4;
+ // The datasets used to train and evaluate the model.
+ repeated Datasets datasets = 5;
+ // The input format(s) of the model
+ repeated MachineLearningInputOutputParameters inputs = 6;
+ // The output format(s) from the model
+ repeated MachineLearningInputOutputParameters outputs = 7;
+
+ message Approach {
+ optional ModelParameterApproachType type = 1;
+ }
+ message Datasets {
+ oneof choice {
+ ComponentData dataset = 1;
+ // References a data component by the components bom-ref attribute
+ string ref = 2;
+ }
+ }
+ message MachineLearningInputOutputParameters {
+ // The data format for input/output to the model. Example formats include string, image, time-series
+ optional string format = 1;
+ }
+ }
+ message QuantitativeAnalysis {
+ // The model performance metrics being reported. Examples may include accuracy, F1 score, precision, top-3 error rates, MSC, etc.
+ repeated PerformanceMetrics performanceMetrics = 1;
+ optional GraphicsCollection graphics = 2;
+
+ message PerformanceMetrics {
+ // The type of performance metric.
+ optional string type = 1;
+ // The value of the performance metric.
+ optional string value = 2;
+ // The name of the slice this metric was computed on. By default, assume this metric is not sliced.
+ optional string slice = 3;
+ // The confidence interval of the metric.
+ optional ConfidenceInterval confidenceInterval = 4;
+
+ message ConfidenceInterval {
+ // The lower bound of the confidence interval.
+ optional string lowerBound = 1;
+ // The upper bound of the confidence interval.
+ optional string upperBound = 2;
+ }
+ }
+ }
+ message ModelCardConsiderations {
+ // Who are the intended users of the model?
+ repeated string users = 1;
+ // What are the intended use cases of the model?
+ repeated string useCases = 2;
+ // What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?
+ repeated string technicalLimitations = 3;
+ // What are the known tradeoffs in accuracy/performance of the model?
+ repeated string performanceTradeoffs = 4;
+ // What are the ethical risks involved in the application of this model?
+ repeated EthicalConsiderations ethicalConsiderations = 5;
+ // How does the model affect groups at risk of being systematically disadvantaged? What are the harms and benefits to the various affected groups?
+ repeated FairnessAssessments fairnessAssessments = 6;
+ // What are the various environmental impacts the corresponding machine learning model has exhibited across its lifecycle?
+ optional EnvironmentalConsiderations environmentalConsiderations = 7;
+
+ message EthicalConsiderations {
+ // The name of the risk.
+ optional string name = 1;
+ // Strategy used to address this risk.
+ optional string mitigationStrategy = 2;
+ }
+ message FairnessAssessments {
+ // The groups or individuals at risk of being systematically disadvantaged by the model.
+ optional string groupAtRisk = 1;
+ // Expected benefits to the identified groups.
+ optional string benefits = 2;
+ // Expected harms to the identified groups.
+ optional string harms = 3;
+ // With respect to the benefits and harms outlined, please describe any mitigation strategy implemented.
+ optional string mitigationStrategy = 4;
+ }
+ message EnvironmentalConsiderations {
+ // Describes energy consumption information incurred for one or more component lifecycle activities.
+ repeated EnergyConsumption energyConsumptions = 1;
+ // Specifies optional, custom properties for environment considerations
+ repeated Property properties = 2;
+ }
+ // Describes energy consumption information incurred for the specified lifecycle activity.
+ message EnergyConsumption {
+ // An activity that is part of a machine learning model development or operational lifecycle.
+ enum ActivityType {
+ ACTIVITY_TYPE_UNSPECIFIED = 0;
+ // a lifecycle activity type whose description does not match currently defined values (the default type).
+ ACTIVITY_TYPE_OTHER = 1;
+ // model design including problem framing, goal definition and algorithm selection.
+ ACTIVITY_TYPE_DESIGN = 2;
+ // model data acquisition including search, selection and transfer.
+ ACTIVITY_TYPE_DATA_COLLECTION = 3;
+ // model data preparation including data cleaning, labeling and conversion.
+ ACTIVITY_TYPE_DATA_PREPARATION = 4;
+ // model building, training and generalized tuning.
+ ACTIVITY_TYPE_TRAINING = 5;
+ // refining a trained model to produce desired outputs for a given problem space.
+ ACTIVITY_TYPE_FINE_TUNING = 6;
+ // model validation including model output evaluation and testing.
+ ACTIVITY_TYPE_VALIDATION = 7;
+ // explicit model deployment to a target hosting infrastructure.
+ ACTIVITY_TYPE_DEPLOYMENT = 8;
+ // generating an output response from a hosted model from a set of inputs.
+ ACTIVITY_TYPE_INFERENCE = 9;
+ }
+
+ // The type of activity that is part of a machine learning model development or operational lifecycle.
+ ActivityType activity = 1;
+ // The providers of the energy consumed by the associated model development lifecycle activity.
+ repeated EnergyProviderType energyProviders = 2;
+ // The total energy cost associated with the model lifecycle activity.
+ EnergyMeasureType activityEnergyCost = 3;
+ // The CO2 cost or debit equivalent to the total energy cost.
+ optional CO2MeasureType co2CostEquivalent = 4;
+ // The CO2 offset or credit for the CO2 equivalent cost.
+ optional CO2MeasureType co2CostOffset = 5;
+ // Specifies optional, custom properties for environment considerations
+ repeated Property properties = 6;
+ }
+ }
+}
+
+
+// Describes the physical provider of energy used for model development or operations.
+message EnergyProviderType {
+ enum EnergySourceType {
+ ENERGY_SOURCE_TYPE_UNSPECIFIED = 0;
+ // energy source: unknown. The energy source is unknown.
+ ENERGY_SOURCE_TYPE_UNKNOWN = 1;
+ // energy source: other. An energy source that is not listed.
+ ENERGY_SOURCE_TYPE_OTHER = 2;
+ // energy source: coal. Energy produced by types of coal.
+ ENERGY_SOURCE_TYPE_COAL = 3;
+ // energy source: oil. Petroleum products (primarily crude oil and its derivative fuel oils).
+ ENERGY_SOURCE_TYPE_OIL = 4;
+ // energy source: natural-gas. Hydrocarbon gas liquids (HGL) that occur as gases at atmospheric pressure and as liquids under higher pressures including Natural gas (C5H12 and heavier), Ethane (C2H6), Propane (C3H8), etc.
+ ENERGY_SOURCE_TYPE_NATURAL_GAS = 5;
+ // energy source: nuclear. Energy produced from the cores of atoms (i.e., through nuclear fission or fusion).
+ ENERGY_SOURCE_TYPE_NUCLEAR = 6;
+ // energy source: wind. Energy produced from moving air.
+ ENERGY_SOURCE_TYPE_WIND = 7;
+ // energy source: solar. Energy produced from the sun (i.e., solar radiation).
+ ENERGY_SOURCE_TYPE_SOLAR = 8;
+ // energy source: geothermal. Energy produced from heat within the earth.
+ ENERGY_SOURCE_TYPE_GEOTHERMAL = 9;
+ // energy source: hydropower. Energy produced from flowing water.
+ ENERGY_SOURCE_TYPE_HYDROPOWER = 10;
+ // energy source: biofuel. Liquid fuels produced from biomass feedstocks (i.e., organic materials such as plants or animals).
+ ENERGY_SOURCE_TYPE_BIOFUEL = 11;
+ }
+
+ // BOM unique reference to the energy provider.
+ optional string bom_ref = 1;
+ // A description of the energy provider.
+ string description = 2;
+ // The organization of the energy provider.
+ OrganizationalEntity organization = 3;
+ // The energy source for the energy provider.
+ EnergySourceType energySource = 4;
+ // The energy provided by the energy source for an associated activity.
+ EnergyMeasureType energyProvided = 5;
+ // Provides the ability to document external references related to the BOM or to the project the BOM describes.
+ repeated ExternalReference external_references = 6;
+}
+
+// A measure of energy.
+message EnergyMeasureType {
+ enum EnergyMeasureUnitType {
+ ENERGY_MEASURE_UNIT_TYPE_UNSPECIFIED = 0;
+ // kilowatt-hour (kWh) is the energy delivered by one kilowatt (kW) of power for one hour (h) (the default unit).
+ ENERGY_MEASURE_UNIT_TYPE_KILOWATT_HOURS = 1;
+ }
+
+ // Quantity of energy.
+ float value = 1;
+ // Unit of energy.
+ EnergyMeasureUnitType unit = 2;
+}
+
+
+// A measure of carbon dioxide (CO2).
+message CO2MeasureType {
+ enum CO2MeasureUnitType {
+ CO2_MEASURE_UNIT_TYPE_UNSPECIFIED = 0;
+ // Tonnes (t) of carbon dioxide (CO2) equivalent (eq) (the default unit).
+ CO2_MEASURE_UNIT_TYPE_TONNES_CO2_EQUIVALENT = 1;
+ }
+
+ // Quantity of carbon dioxide (CO2).
+ float value = 1;
+ // Unit of carbon dioxide (CO2).
+ CO2MeasureUnitType unit = 2;
+}
+
+
+// An address used to identify a contactable location.
+message PostalAddressType {
+ // An optional identifier which can be used to reference the address elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ optional string bom_ref = 1;
+ // The country name or the two-letter ISO 3166-1 country code.
+ optional string country = 2;
+ // The region or state in the country. For example, Texas.
+ optional string region = 3;
+ // The locality or city within the country. For example, Austin.
+ optional string locality = 4;
+ // The post office box number. For example, 901.
+ optional string postOfficeBoxNumber = 5;
+ // The postal code. For example, 78758.
+ optional string postalCodeue = 6;
+ // The street address. For example, 100 Main Street.
+ optional string streetAddress = 7;
+}
+
+enum ModelParameterApproachType {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- value `0` is a fallback(meaning "unspecified") in protobuf3. this usage here is an error, it shall be fixed with v2.0 of this very schema
+ // Supervised machine learning involves training an algorithm on labeled data to predict or classify new data based on the patterns learned from the labeled examples.
+ MODEL_PARAMETER_APPROACH_TYPE_SUPERVISED = 0;
+ // Unsupervised machine learning involves training algorithms on unlabeled data to discover patterns, structures, or relationships without explicit guidance, allowing the model to identify inherent structures or clusters within the data.
+ MODEL_PARAMETER_APPROACH_TYPE_UNSUPERVISED = 1;
+ // Reinforcement learning is a type of machine learning where an agent learns to make decisions by interacting with an environment to maximize cumulative rewards, through trial and error.
+ MODEL_PARAMETER_APPROACH_TYPE_REINFORCED_LEARNING = 2;
+ // Semi-supervised machine learning utilizes a combination of labeled and unlabeled data during training to improve model performance, leveraging the benefits of both supervised and unsupervised learning techniques.
+ MODEL_PARAMETER_APPROACH_TYPE_SEMI_SUPERVISED = 3;
+ // Self-supervised machine learning involves training models to predict parts of the input data from other parts of the same data, without requiring external labels, enabling learning from large amounts of unlabeled data.
+ MODEL_PARAMETER_APPROACH_TYPE_SELF_SUPERVISED = 4;
+}
+
+message ComponentData {
+ // An optional identifier which can be used to reference the dataset elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ optional string bom_ref = 1;
+ // The general theme or subject matter of the data being specified.
+ ComponentDataType type = 2;
+ // The name of the dataset.
+ optional string name = 3;
+ // The contents or references to the contents of the data being described.
+ optional ComponentDataContents contents = 4;
+ // Data classification tags data according to its type, sensitivity, and value if altered, stolen, or destroyed.
+ optional string classification = 5;
+ // A description of any sensitive data in a dataset.
+ repeated string sensitiveData = 6;
+ // A collection of graphics that represent various measurements.
+ optional GraphicsCollection graphics = 7;
+ // A description of the dataset. Can describe size of dataset, whether it's used for source code, training, testing, or validation, etc.
+ optional string description = 8;
+ // Data Governance
+ optional DataGovernance governance = 9;
+
+ message ComponentDataContents {
+ // An optional way to include textual or encoded data.
+ optional AttachedText attachment = 1;
+ // The URL to where the data can be retrieved.
+ optional string url = 2;
+ // Provides the ability to document name-value parameters used for configuration.
+ repeated Property properties = 3;
+ }
+}
+
+message DataGovernance {
+ // Data custodians are responsible for the safe custody, transport, and storage of data.
+ repeated DataGovernanceResponsibleParty custodians = 1;
+ // Data stewards are responsible for data content, context, and associated business rules.
+ repeated DataGovernanceResponsibleParty stewards = 2;
+ // Data owners are concerned with risk and appropriate access to data.
+ repeated DataGovernanceResponsibleParty owners = 3;
+
+ message DataGovernanceResponsibleParty {
+ oneof choice {
+ OrganizationalEntity organization = 1;
+ OrganizationalContact contact = 2;
+ }
+ }
+}
+
+enum ComponentDataType {
+ // Any type of code, code snippet, or data-as-code
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- value `0` is a fallback(meaning "unspecified") in protobuf3. this usage here is an error, it shall be fixed with v2.0 of this very schema
+ COMPONENT_DATA_TYPE_SOURCE_CODE = 0;
+ // Parameters or settings that may be used by other components.
+ COMPONENT_DATA_TYPE_CONFIGURATION = 1;
+ // A collection of data.
+ COMPONENT_DATA_TYPE_DATASET = 2;
+ // Data that can be used to create new instances of what the definition defines.
+ COMPONENT_DATA_TYPE_DEFINITION = 3;
+ // Any other type of data that does not fit into existing definitions.
+ COMPONENT_DATA_TYPE_OTHER = 4;
+}
+
+message GraphicsCollection {
+ // A description of this collection of graphics.
+ optional string description = 1;
+ // A collection of graphics.
+ repeated Graphic graphic = 2;
+
+ message Graphic {
+ // The name of the graphic.
+ optional string name = 1;
+ // The graphic (vector or raster). Base64 encoding MUST be specified for binary images.
+ optional AttachedText image = 2;
+ }
+}
+
+// Describes workflows and resources that captures rules and other aspects of how the associated BOM component or service was formed.
+message Formula {
+ // BOM unique reference to the resource.
+ optional string bom_ref = 1;
+ // Transient components that are used in tasks that constitute one or more of this formula's workflows
+ repeated Component components = 2;
+ // Transient services that are used in tasks that constitute one or more of this formula's workflows
+ repeated Service services = 3;
+ // List of workflows that can be declared to accomplish specific orchestrated goals and independently triggered.
+ repeated Workflow workflows = 4;
+ // Domain-specific formula properties.
+ repeated Property properties = 5;
+}
+
+// A specialized orchestration task.
+message Workflow {
+ // BOM unique reference to the resource.
+ string bom_ref = 1;
+ // The unique identifier for the resource instance within its deployment context.
+ string uid = 2;
+ // The name of the resource instance.
+ optional string name = 3;
+ // A description of the resource instance.
+ optional string description = 4;
+ // Domain-specific resource instance properties.
+ repeated Property properties = 5;
+ // References to component or service resources that are used to realize the resource instance.
+ repeated ResourceReferenceChoice resourceReferences = 6;
+ // The tasks that comprise the workflow.
+ repeated Task tasks = 7;
+ // The graph of dependencies between tasks within the workflow.
+ repeated Dependency taskDependencies = 8;
+ // Indicates the types of activities performed by the set of workflow tasks.
+ repeated TaskType taskTypes = 9;
+ // The trigger that initiated the task.
+ optional Trigger trigger = 10;
+ // The sequence of steps for the task.
+ repeated Step steps = 11;
+ // Represents resources and data brought into a task at runtime by executor or task commands
+ repeated InputType inputs = 12;
+ // Represents resources and data output from a task at runtime by executor or task commands
+ repeated OutputType outputs = 13;
+ // The date and time (timestamp) when the task started.
+ optional google.protobuf.Timestamp timeStart = 14;
+ // The date and time (timestamp) when the task ended.
+ optional google.protobuf.Timestamp timeEnd = 15;
+ // A set of named filesystem or data resource shareable by workflow tasks.
+ repeated Workspace workspaces = 16;
+ // A graph of the component runtime topology for workflow's instance.
+ repeated Dependency runtimeTopology = 17;
+}
+
+// Describes the inputs, sequence of steps and resources used to accomplish a task and its output.
+message Task {
+ // BOM unique reference to the resource.
+ string bom_ref = 1;
+ // The unique identifier for the resource instance within its deployment context.
+ string uid = 2;
+ // The name of the resource instance.
+ optional string name = 3;
+ // A description of the resource instance.
+ optional string description = 4;
+ // Domain-specific task instance properties.
+ repeated Property properties = 5;
+ // References to component or service resources that are used to realize the resource instance.
+ repeated ResourceReferenceChoice resourceReferences = 6;
+ // Indicates the types of activities performed by the set of workflow tasks.
+ repeated TaskType taskTypes = 7;
+ // The trigger that initiated the task.
+ optional Trigger trigger = 8;
+ // "The sequence of steps for the task.
+ repeated Step steps = 9;
+ // Represents resources and data brought into a task at runtime by an executor or task commands
+ repeated InputType inputs = 10;
+ // Represents resources and data output from a task at runtime by an executor or task commands
+ repeated OutputType outputs = 11;
+ // The date and time (timestamp) when the task started.
+ optional google.protobuf.Timestamp timeStart = 14;
+ // The date and time (timestamp) when the task ended.
+ optional google.protobuf.Timestamp timeEnd = 15;
+ // A set of named filesystem or data resource shareable by workflow tasks.
+ repeated Workspace workspaces = 16;
+ // A graph of the component runtime topology for task's instance.
+ repeated Dependency runtimeTopology = 17;
+}
+
+// Executes specific commands or tools in order to accomplish its owning task as part of a sequence.
+message Step {
+ // A name for the step.
+ optional string name = 1;
+ // A description of the step.
+ optional string description = 2;
+ // Ordered list of commands or directives for the step
+ repeated Command commands = 3;
+ // Domain-specific step properties.
+ repeated Property properties = 4;
+}
+
+message Command {
+ // A text representation of the executed command.
+ optional string executed = 1;
+ // Domain-specific command properties.
+ repeated Property properties = 2;
+}
+
+// A named filesystem or data resource shareable by workflow tasks.
+message Workspace {
+ // BOM unique reference to the resource.
+ string bom_ref = 1;
+ // The unique identifier for the resource instance within its deployment context.
+ string uid = 2;
+ // The name of the resource instance.
+ optional string name = 3;
+ // The names for the workspace as referenced by other workflow tasks. Effectively, a name mapping so other tasks can use their own local name in their steps.
+ repeated string aliases = 4;
+ // A description of the resource instance.
+ optional string description = 5;
+ // Domain-specific workspace instance properties.
+ repeated Property properties = 6;
+ // References to component or service resources that are used to realize the resource instance.
+ repeated ResourceReferenceChoice resourceReferences = 7;
+ // Describes the read-write access control for the workspace relative to the owning resource instance.
+ optional AccessMode accessMode = 8;
+ // A path to a location on disk where the workspace will be available for the associated task's steps.
+ optional string mountPath = 9;
+ // The name of a domain-specific data type the workspace represents.
+ optional string managedDataType = 10;
+ // Identifies the reference to the request for a specific volume type and parameters.
+ optional string volumeRequest = 11;
+ // Information about the actual volume instance allocated to the workspace.
+ optional Volume volume = 12;
+
+ enum AccessMode {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- value `0` is a fallback(meaning "unspecified") in protobuf3. this usage here is an error; it shall be fixed with v2.0 of this very schema
+ ACCESS_MODE_READ_ONLY = 0;
+ ACCESS_MODE_READ_WRITE = 1;
+ ACCESS_MODE_READ_WRITE_ONCE = 2;
+ ACCESS_MODE_WRITE_ONCE = 3;
+ ACCESS_MODE_WRITE_ONLY = 4;
+ }
+}
+
+// An identifiable, logical unit of data storage tied to a physical device.
+message Volume {
+ // The unique identifier for the volume instance within its deployment context.
+ optional string uid = 1;
+ // The name of the volume instance
+ optional string name = 2;
+ // The volume mode for the volume instance.
+ optional VolumeMode mode = 3;
+ // The underlying path created from the actual volume.
+ optional string path = 4;
+ // The allocated size of the volume accessible to the associated workspace. This should include the scalar size as well as the IEC standard unit in either decimal or binary form.
+ optional string sizeAllocated = 5;
+ // Indicates if the volume persists beyond the life of the resource it is associated with.
+ optional bool persistent = 6;
+ // Indicates if the volume is remotely (i.e., network) attached.
+ optional bool remote = 7;
+ // Domain-specific volume instance properties.
+ repeated Property properties = 8;
+
+ enum VolumeMode {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- value `0` is a fallback(meaning "unspecified") in protobuf3. this usage here is an error; it shall be fixed with v2.0 of this very schema
+ VOLUME_MODE_FILESYSTEM = 0;
+ VOLUME_MODE_BLOCK = 1;
+ }
+}
+
+// Represents a resource that can conditionally activate (or fire) tasks based upon associated events and their data.
+message Trigger {
+ // BOM unique reference to the resource.
+ string bom_ref = 1;
+ // The unique identifier for the resource instance within its deployment context.
+ string uid = 2;
+ // The name of the resource instance.
+ optional string name = 3;
+ // A description of the resource instance.
+ optional string description = 4;
+ // Additional properties of the trigger.
+ repeated Property properties = 5;
+ // References to component or service resources that are used to realize the resource instance.
+ repeated ResourceReferenceChoice resourceReferences = 6;
+ // The source type of event which caused the trigger to fire.
+ TriggerType type = 7;
+ // The event data that caused the associated trigger to activate.
+ optional Event event = 8;
+ // Conditions
+ repeated Condition conditions = 9;
+ // The date and time (timestamp) when the trigger was activated.
+ optional google.protobuf.Timestamp timeActivated = 10;
+ // Represents resources and data brought into a task at runtime by an executor or task commands
+ repeated InputType inputs = 11;
+ // Represents resources and data output from a task at runtime by an executor or task commands
+ repeated OutputType outputs = 12;
+
+ enum TriggerType {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- value `0` is a fallback(meaning "unspecified") in protobuf3. this usage here is an error; it shall be fixed with v2.0 of this very schema
+ TRIGGER_TYPE_MANUAL = 0;
+ TRIGGER_TYPE_API = 1;
+ TRIGGER_TYPE_WEBHOOK = 2;
+ TRIGGER_TYPE_SCHEDULED = 3;
+ }
+}
+
+// Represents something that happened that may trigger a response.
+message Event {
+ // The unique identifier of the event.
+ optional string uid = 1;
+ // A description of the event.
+ optional string description = 2;
+ // The date and time (timestamp) when the event was received.
+ optional google.protobuf.Timestamp timeReceived = 3;
+ // Encoding of the raw event data.
+ optional AttachedText data = 4;
+ // References the component or service that was the source of the event
+ optional ResourceReferenceChoice source = 5;
+ // References the component or service that was the target of the event
+ optional ResourceReferenceChoice target = 6;
+ // Additional properties of the event.
+ repeated Property properties = 7;
+}
+
+// Type that represents various input data types and formats.
+message InputType {
+ // A references to the component or service that provided the input to the task (e.g., reference to a service with a data flow value of `inbound`)
+ optional ResourceReferenceChoice source = 1;
+ // A reference to the component or service that received or stored the input if not the task itself (e.g., a local, named storage workspace)
+ optional ResourceReferenceChoice target = 2;
+ // A reference to an independent resource provided as an input to a task by the workflow runtime.
+ optional ResourceReferenceChoice resource = 3;
+ // Inputs that have the form of parameters with names and values.
+ repeated Parameter parameters = 4;
+ // Inputs that have the form of parameters with names and values.
+ repeated EnvironmentVars environmentVars = 5;
+ // Inputs that have the form of data.
+ optional AttachedText data = 6;
+ // Additional properties of the input data.
+ repeated Property properties = 7;
+}
+
+// Type that represents various output data types and formats.
+message OutputType {
+ // Describes the type of data output.
+ optional OutputTypeType type = 1;
+ // Component or service that generated or provided the output from the task (e.g., a build tool)
+ optional ResourceReferenceChoice source = 2;
+ // Component or service that received the output from the task (e.g., reference to an artifactory service with data flow value of `outbound`)
+ optional ResourceReferenceChoice target = 3;
+ // A reference to an independent resource generated as output by the task.
+ optional ResourceReferenceChoice resource = 4;
+ // Outputs that have the form of data.
+ optional AttachedText data = 5;
+ // Outputs that have the form of environment variables.
+ repeated EnvironmentVars environmentVars = 6;
+ // Additional properties of the output data.
+ repeated Property properties = 7;
+
+ // buf:lint:ignore ENUM_VALUE_PREFIX -- Enum value names should be prefixed with "OUTPUT_TYPE_TYPE_"
+ enum OutputTypeType {
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- value `0` is a fallback(meaning "unspecified") in protobuf3. this usage here is an error; it shall be fixed with v2.0 of this very schema
+ OUTPUT_TYPE_ARTIFACT = 0;
+ OUTPUT_TYPE_ATTESTATION = 1;
+ OUTPUT_TYPE_LOG = 2;
+ OUTPUT_TYPE_EVIDENCE = 3;
+ OUTPUT_TYPE_METRICS = 4;
+ OUTPUT_TYPE_OTHER = 5;
+ }
+}
+
+// Type that permits a choice to reference a resource using an iternal bom-ref identifier or an external reference.
+message ResourceReferenceChoice {
+ oneof choice {
+ string ref = 1;
+ ExternalReference externalReference = 2;
+ }
+}
+
+// A condition that was used to determine a trigger should be activated.
+message Condition {
+ // Describes the set of conditions which cause the trigger to activate.
+ optional string description = 1;
+ // The logical expression that was evaluated that determined the trigger should be fired.
+ optional string expression = 2;
+ // Domain-specific condition instance properties.
+ repeated Property properties = 3;
+}
+
+enum TaskType {
+ // A task that copies software or data used to accomplish other tasks in the workflow.
+ // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- value `0` is a fallback(meaning "unspecified") in protobuf3. this usage here is an error; it shall be fixed with v2.0 of this very schema
+ TASK_TYPE_COPY = 0;
+ // A task that clones a software repository into the workflow in order to retrieve its source code or data for use in a build step.
+ TASK_TYPE_CLONE = 1;
+ // A task that checks source code for programmatic and stylistic errors.
+ TASK_TYPE_LINT = 2;
+ // A task that performs a scan against source code, or built or deployed components and services. Scans are typically run to gather or test for security vulnerabilities or policy compliance.
+ TASK_TYPE_SCAN = 3;
+ // A task that merges changes or fixes into source code prior to a build step in the workflow.
+ TASK_TYPE_MERGE = 4;
+ // A task that builds the source code, dependencies and/or data into an artifact that can be deployed to and executed on target systems.
+ TASK_TYPE_BUILD = 5;
+ // A task that verifies the functionality of a component or service.
+ TASK_TYPE_TEST = 6;
+ // A task that delivers a built artifact to one or more target repositories or storage systems.
+ TASK_TYPE_DELIVER = 7;
+ // A task that deploys a built artifact for execution on one or more target systems.
+ TASK_TYPE_DEPLOY = 8;
+ // A task that releases a built, versioned artifact to a target repository or distribution system.
+ TASK_TYPE_RELEASE = 9;
+ // A task that cleans unnecessary tools, build artifacts and/or data from workflow storage.
+ TASK_TYPE_CLEAN = 10;
+ // A workflow task that does not match current task type definitions.
+ TASK_TYPE_OTHER = 11;
+}
+
+// A representation of a functional parameter.
+message Parameter {
+ // The name of the parameter.
+ optional string name = 1;
+ // The value of the parameter.
+ optional string value = 2;
+ // The data type of the parameter.
+ optional string dataType = 3;
+}
+
+message EnvironmentVars {
+ oneof choice {
+ Property property = 1;
+ string value = 2;
+ }
+}
+
+message Declarations {
+ message Assessor {
+ // An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 1;
+ // The boolean indicating if the assessor is outside the organization generating claims. A value of false indicates a self assessor.
+ optional bool thirdParty = 2;
+ // The entity issuing the assessment.
+ optional OrganizationalEntity organization = 3;
+ }
+ message Attestation {
+ message AttestationMap {
+ message AttestationConformance {
+ // The conformance of the claim between and inclusive of 0 and 1, where 1 is 100% conformance.
+ optional double score = 1;
+ // The rationale for the conformance score.
+ optional string rationale = 2;
+ // The list of `bom-ref` to the evidence provided describing the mitigation strategies.
+ repeated string mitigationStrategies = 3;
+ }
+ message AttestationConfidence {
+ // The confidence of the claim between and inclusive of 0 and 1, where 1 is 100% confidence.
+ optional double score = 1;
+ // The rationale for the confidence score.
+ optional string rationale = 2;
+ }
+ // The `bom-ref` to the requirement being attested to.
+ optional string requirement = 1;
+ // The list of `bom-ref` to the claims being attested to.
+ repeated string claims = 2;
+ // The list of `bom-ref` to the counter claims being attested to.
+ repeated string counterClaims = 3;
+ // The conformance of the claim meeting a requirement.
+ optional AttestationConformance conformance = 4;
+ // The confidence of the claim meeting the requirement.
+ optional AttestationConfidence confidence = 5;
+ }
+ // The short description explaining the main points of the attestation.
+ optional string summary = 1;
+ // The `bom-ref` to the assessor asserting the attestation.
+ optional string assessor = 2;
+ // The grouping of requirements to claims and the attestors' declared conformance and confidence thereof.
+ repeated AttestationMap map = 3;
+ }
+ message Claim {
+ // An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 1;
+ // The `bom-ref` to a target representing a specific system, application, API, module, team, person, process, business unit, company, etc... that this claim is being applied to.
+ optional string target = 2;
+ // The specific statement or assertion about the target.
+ optional string predicate = 3;
+ // The list of `bom-ref` to the evidence provided describing the mitigation strategies. Each mitigation strategy should include an explanation of how any weaknesses in the evidence will be mitigated.
+ repeated string mitigationStrategies = 4;
+ // The written explanation of why the evidence provided substantiates the claim.
+ optional string reasoning = 5;
+ // The list of `bom-ref` to evidence that supports this claim.
+ repeated string evidence = 6;
+ // The list of `bom-ref` to counterEvidence that supports this claim.
+ repeated string counterEvidence = 7;
+ // External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM.
+ repeated ExternalReference externalReferences = 8;
+ }
+ message Evidence {
+ message Data {
+ message Contents {
+ // An optional way to include textual or encoded data.
+ optional AttachedText attachment = 1;
+ // The URL to where the data can be retrieved.
+ optional string url = 2;
+ }
+ // The name of the data.
+ optional string name = 1;
+ // The contents or references to the contents of the data being described.
+ optional Contents contents = 2;
+ // Data classification tags data according to its type, sensitivity, and value if altered, stolen, or destroyed.
+ optional string classification = 3;
+ // A description of any sensitive data included.
+ repeated string sensitiveData = 4;
+ // Data Governance
+ optional DataGovernance governance = 5;
+ }
+ // An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 1;
+ // The reference to the property name as defined in the CycloneDX Property Taxonomy: https://github.com/CycloneDX/cyclonedx-property-taxonomy/.
+ optional string propertyName = 2;
+ // The written description of what this evidence is and how it was created.
+ optional string description = 3;
+ // The output or analysis that supports claims.
+ repeated Data data = 4;
+ // The date and time (timestamp) when the evidence was created.
+ optional google.protobuf.Timestamp created = 5;
+ // The optional date and time (timestamp) when the evidence is no longer valid.
+ optional google.protobuf.Timestamp expires = 6;
+ // The author of the evidence.
+ optional OrganizationalContact author = 7;
+ // The reviewer of the evidence.
+ optional OrganizationalContact reviewer = 8;
+ }
+ message Targets {
+ // The list of organizations which claims are made against.
+ repeated OrganizationalEntity organizations = 1;
+ // The list of components which claims are made against.
+ repeated Component components = 2;
+ // The list of services which claims are made against.
+ repeated Service services = 3;
+ }
+ message Affirmation {
+ message Signatory {
+ // The signatory's name.
+ optional string name = 1;
+ // The signatory's role within an organization.
+ optional string role = 2;
+ // The signatory's organization.
+ optional OrganizationalEntity organization = 3;
+ // An External reference provides a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM.
+ optional ExternalReference externalReference = 4;
+ }
+ // The brief statement affirmed by an individual regarding all declarations. Notes: This could be an affirmation of acceptance by a third-party auditor or receiving individual of a file.
+ optional string statement = 1;
+ // The list of signatories authorized on behalf of an organization to assert validity of this document.
+ repeated Signatory signatories = 2;
+ }
+ // The list of assessors evaluating claims and determining conformance to requirements and confidence in that assessment.
+ repeated Assessor assessors = 1;
+ // The list of attestations asserted by an assessor that maps requirements to claims.
+ repeated Attestation attestations = 2;
+ // The list of claims.
+ repeated Claim claims = 3;
+ // The list of evidence
+ repeated Evidence evidence = 4;
+ // The list of targets which claims are made against.
+ optional Targets targets = 5;
+ // affirmation
+ optional Affirmation affirmation = 6;
+}
+
+message Definition {
+ message Standard {
+ message Requirement {
+ // An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 1;
+ // The unique identifier used in the standard to identify a specific requirement. This should match what is in the standard and should not be the requirements bom-ref.
+ optional string identifier = 2;
+ // The title of the requirement.
+ optional string title = 3;
+ // The textual content of the requirement.
+ optional string text = 4;
+ // The supplemental text that provides additional guidance or context to the requirement but is not directly part of the requirement.
+ repeated string descriptions = 5;
+ // The Common Requirements Enumeration (CRE) identifier(s). CRE is a structured and standardized framework for uniting security standards and guidelines. CRE links each section of a resource to a shared topic identifier (a Common Requirement). Through this shared topic link, all resources map to each other. The use of CRE promotes clear and unambiguous communication among stakeholders.
+ repeated string openCre = 6;
+ // The optional `bom-ref` to a parent requirement. This establishes a hierarchy of requirements. Top-level requirements must not define a parent. Only child requirements should define parents.
+ optional string parent = 7;
+ // Specifies optional, custom, properties
+ repeated Property properties = 8;
+ // External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM.
+ repeated ExternalReference externalReferences = 9;
+ }
+ message Level {
+ // An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 1;
+ // The identifier used in the standard to identify a specific level.
+ optional string identifier = 2;
+ // The title of the level.
+ optional string title = 3;
+ // The description of the level.
+ optional string description = 4;
+ // The list of requirement `bom-ref`s that comprise the level.
+ repeated string requirements = 5;
+ }
+ // An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
+ optional string bom_ref = 1;
+ // The name of the standard. This will often be a shortened, single name of the standard.
+ optional string name = 2;
+ // The version of the standard.
+ optional string version = 3;
+ // The description of the standard.
+ optional string description = 4;
+ // The owner of the standard, often the entity responsible for its release.
+ optional string owner = 5;
+ // The list of requirements comprising the standard.
+ repeated Requirement requirements = 6;
+ // The list of levels associated with the standard. Some standards have different levels of compliance.
+ repeated Level levels = 7;
+ // External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM.
+ repeated ExternalReference externalReferences = 8;
+ }
+ repeated Standard standards = 1;
+}
+
+message CryptoProperties {
+ enum CryptoAssetType {
+ // ProtoBuff's default value
+ CRYPTO_ASSET_TYPE_UNSPECIFIED = 0;
+ CRYPTO_ASSET_TYPE_ALGORITHM = 1;
+ CRYPTO_ASSET_TYPE_CERTIFICATE = 2;
+ CRYPTO_ASSET_TYPE_PROTOCOL = 3;
+ CRYPTO_ASSET_TYPE_RELATED_CRYPTO_MATERIAL = 4;
+ }
+ message AlgorithmProperties {
+ enum CryptoPrimitive {
+ // ProtoBuff's default value -- it differs from "unknown"
+ CRYPTO_PRIMITIVE_UNSPECIFIED = 0;
+ // The primitive is not known
+ CRYPTO_PRIMITIVE_UNKNOWN = 1;
+ // Another primitive type - none of the following
+ CRYPTO_PRIMITIVE_OTHER = 2;
+ CRYPTO_PRIMITIVE_DRBG = 3;
+ CRYPTO_PRIMITIVE_MAC = 4;
+ CRYPTO_PRIMITIVE_BLOCK_CIPHER = 5;
+ CRYPTO_PRIMITIVE_STREAM_CIPHER = 6;
+ CRYPTO_PRIMITIVE_SIGNATURE = 7;
+ CRYPTO_PRIMITIVE_HASH = 8;
+ CRYPTO_PRIMITIVE_PKE = 9;
+ CRYPTO_PRIMITIVE_XOF = 10;
+ CRYPTO_PRIMITIVE_KDF = 11;
+ CRYPTO_PRIMITIVE_KEY_AGREE = 12;
+ CRYPTO_PRIMITIVE_KEM = 13;
+ CRYPTO_PRIMITIVE_AE = 14;
+ CRYPTO_PRIMITIVE_COMBINER = 15;
+ }
+ enum CryptoExecutionEnvironment {
+ // ProtoBuff's default value -- it differs from "unknown"
+ CRYPTO_EXECUTION_ENVIRONMENT_UNSPECIFIED = 0;
+ // The execution environment is not known
+ CRYPTO_EXECUTION_ENVIRONMENT_UNKNOWN = 1;
+ // Another implementation environment - none of the following
+ CRYPTO_EXECUTION_ENVIRONMENT_OTHER = 2;
+ CRYPTO_EXECUTION_ENVIRONMENT_SOFTWARE_PLAIN_RAM = 3;
+ CRYPTO_EXECUTION_ENVIRONMENT_SOFTWARE_ENCRYPTED_RAM = 4;
+ CRYPTO_EXECUTION_ENVIRONMENT_SOFTWARE_TEE = 5;
+ CRYPTO_EXECUTION_ENVIRONMENT_HARDWARE = 6;
+ }
+ enum CryptoImplementationPlatform {
+ // ProtoBuff's default value -- it differs from "unknown"
+ CRYPTO_IMPLEMENTATION_PLATFORM_UNSPECIFIED = 0;
+ // the platform is not known
+ CRYPTO_IMPLEMENTATION_PLATFORM_UNKNOWN = 1;
+ // none of the following
+ CRYPTO_IMPLEMENTATION_PLATFORM_OTHER = 2;
+ CRYPTO_IMPLEMENTATION_PLATFORM_GENERIC = 3;
+ CRYPTO_IMPLEMENTATION_PLATFORM_X86_32 = 4;
+ CRYPTO_IMPLEMENTATION_PLATFORM_X86_64 = 5;
+ CRYPTO_IMPLEMENTATION_PLATFORM_ARMV7A = 6;
+ CRYPTO_IMPLEMENTATION_PLATFORM_ARMV7M = 7;
+ CRYPTO_IMPLEMENTATION_PLATFORM_ARMV8A = 8;
+ CRYPTO_IMPLEMENTATION_PLATFORM_ARMV8M = 9;
+ CRYPTO_IMPLEMENTATION_PLATFORM_ARMV9A = 10;
+ CRYPTO_IMPLEMENTATION_PLATFORM_ARMV9M = 11;
+ CRYPTO_IMPLEMENTATION_PLATFORM_X390X = 12;
+ CRYPTO_IMPLEMENTATION_PLATFORM_PPC64 = 13;
+ CRYPTO_IMPLEMENTATION_PLATFORM_PPC64LE = 14;
+ }
+ enum CryptoAlgorithmMode {
+ // ProtoBuff's default value -- it differs from "unknown"
+ CRYPTO_ALGORITHM_MODE_UNSPECIFIED = 0;
+ // The mode of operation is not known
+ CRYPTO_ALGORITHM_MODE_UNKNOWN = 1;
+ // Another mode of operation - none of the following
+ CRYPTO_ALGORITHM_MODE_OTHER = 2;
+ CRYPTO_ALGORITHM_MODE_CBC = 3;
+ CRYPTO_ALGORITHM_MODE_ECB = 4;
+ CRYPTO_ALGORITHM_MODE_CCM = 5;
+ CRYPTO_ALGORITHM_MODE_GCM = 6;
+ CRYPTO_ALGORITHM_MODE_CFB = 7;
+ CRYPTO_ALGORITHM_MODE_OFB = 8;
+ CRYPTO_ALGORITHM_MODE_CTR = 9;
+ }
+ enum CryptoAlgorithmPadding {
+ // ProtoBuff's default value -- it differs from "unknown"
+ CRYPTO_ALGORITHM_PADDING_UNSPECIFIED = 0;
+ // The padding scheme is not known
+ CRYPTO_ALGORITHM_PADDING_UNKNOWN = 1;
+ // Another padding scheme - none of the following
+ CRYPTO_ALGORITHM_PADDING_OTHER = 2;
+ CRYPTO_ALGORITHM_PADDING_PKCS5 = 3;
+ CRYPTO_ALGORITHM_PADDING_PKCS7 = 4;
+ CRYPTO_ALGORITHM_PADDING_PKCS1V15 = 5;
+ CRYPTO_ALGORITHM_PADDING_OAEP = 6;
+ CRYPTO_ALGORITHM_PADDING_RAW = 7;
+ }
+ enum CryptoAlgorithmFunction {
+ // ProtoBuff's default value -- it differs from "unknown"
+ CRYPTO_ALGORITHM_FUNCTION_UNSPECIFIED = 0;
+ // meaning "there is some, but it is unclear which one"
+ CRYPTO_ALGORITHM_FUNCTION_UNKNOWN = 1;
+ // none of the following
+ CRYPTO_ALGORITHM_FUNCTION_OTHER = 2;
+ CRYPTO_ALGORITHM_FUNCTION_GENERATE = 3;
+ CRYPTO_ALGORITHM_FUNCTION_KEYGEN = 4;
+ CRYPTO_ALGORITHM_FUNCTION_ENCRYPT = 5;
+ CRYPTO_ALGORITHM_FUNCTION_DECRYPT = 6;
+ CRYPTO_ALGORITHM_FUNCTION_DIGEST = 7;
+ CRYPTO_ALGORITHM_FUNCTION_TAG = 8;
+ CRYPTO_ALGORITHM_FUNCTION_KEYDERIVE = 9;
+ CRYPTO_ALGORITHM_FUNCTION_SIGN = 10;
+ CRYPTO_ALGORITHM_FUNCTION_VERIFY = 11;
+ CRYPTO_ALGORITHM_FUNCTION_ENCAPSULATE = 12;
+ CRYPTO_ALGORITHM_FUNCTION_DECAPSULATE = 13;
+ }
+ // Cryptographic building blocks used in higher-level cryptographic systems and protocols. Primitives represent different cryptographic routines: deterministic random bit generators (drbg, e.g. CTR_DRBG from NIST SP800-90A-r1), message authentication codes (mac, e.g. HMAC-SHA-256), blockciphers (e.g. AES), streamciphers (e.g. Salsa20), signatures (e.g. ECDSA), hash functions (e.g. SHA-256), public-key encryption schemes (pke, e.g. RSA), extended output functions (xof, e.g. SHAKE256), key derivation functions (e.g. pbkdf2), key agreement algorithms (e.g. ECDH), key encapsulation mechanisms (e.g. ML-KEM), authenticated encryption (ae, e.g. AES-GCM) and the combination of multiple algorithms (combiner, e.g. SP800-56Cr2).
+ optional CryptoPrimitive primitive = 1;
+ // An identifier for the parameter set of the cryptographic algorithm. Examples: in AES128, '128' identifies the key length in bits, in SHA256, '256' identifies the digest length, '128' in SHAKE128 identifies its maximum security level in bits, and 'SHA2-128s' identifies a parameter set used in SLH-DSA (FIPS205).
+ optional string parameterSetIdentifier = 2;
+ // The specific underlying Elliptic Curve (EC) definition employed which is an indicator of the level of security strength, performance and complexity. Absent an authoritative source of curve names, CycloneDX recommends use of curve names as defined at [https://neuromancer.sk/std/](https://neuromancer.sk/std/), the source from which can be found at [https://github.com/J08nY/std-curves](https://github.com/J08nY/std-curves).
+ optional string curve = 3;
+ // The target and execution environment in which the algorithm is implemented in.
+ optional CryptoExecutionEnvironment executionEnvironment = 4;
+ // The target platform for which the algorithm is implemented. The implementation can be 'generic', running on any platform or for a specific platform.
+ optional CryptoImplementationPlatform implementationPlatform = 5;
+ // The certification that the implementation of the cryptographic algorithm has received, if any. Certifications include revisions and levels of FIPS 140 or Common Criteria of different Extended Assurance Levels (CC-EAL).
+ repeated string certificationLevel = 6;
+ // The mode of operation in which the cryptographic algorithm (block cipher) is used.
+ optional CryptoAlgorithmMode mode = 7;
+ // The padding scheme that is used for the cryptographic algorithm.
+ optional CryptoAlgorithmPadding padding = 8;
+ // The cryptographic functions implemented by the cryptographic algorithm.
+ repeated CryptoAlgorithmFunction cryptoFunctions = 9;
+ // The classical security level that a cryptographic algorithm provides (in bits).
+ optional int32 classicalSecurityLevel = 10;
+ // The NIST security strength category as defined in https://csrc.nist.gov/projects/post-quantum-cryptography/post-quantum-cryptography-standardization/evaluation-criteria/security-(evaluation-criteria). A value of 0 indicates that none of the categories are met.
+ optional int32 nistQuantumSecurityLevel = 11;
+ } // end of AlgorithmProperties
+ message CertificateProperties {
+ // The subject name for the certificate
+ optional string subjectName = 1;
+ // The issuer name for the certificate
+ optional string issuerName = 2;
+ // The date and time according to ISO-8601 standard from which the certificate is valid
+ optional google.protobuf.Timestamp notValidBefore = 3;
+ // The date and time according to ISO-8601 standard from which the certificate is not valid anymore
+ optional google.protobuf.Timestamp notValidAfter = 4;
+ // The bom-ref to signature algorithm used by the certificate
+ optional string signatureAlgorithmRef = 5;
+ // The bom-ref to the public key of the subject
+ optional string subjectPublicKeyRef = 6;
+ // The format of the certificate. Examples include X.509, PEM, DER, and CVC.
+ optional string certificateFormat = 7;
+ // The file extension of the certificate. Examples include crt, pem, cer, der, and p12.
+ optional string certificateExtension = 8;
+ } // end of CertificateProperties
+ message RelatedCryptoMaterialProperties {
+ enum CryptoRelatedType {
+ // ProtoBuff's default value -- it differs from "unknown"
+ CRYPTO_RELATED_TYPE_UNSPECIFIED = 0;
+ // The type of cryptographic asset is not known.
+ CRYPTO_RELATED_TYPE_UNKNOWN = 1;
+ // Another type of cryptographic asset - none of the following
+ CRYPTO_RELATED_TYPE_OTHER = 2;
+ CRYPTO_RELATED_TYPE_PRIVATE_KEY = 3;
+ CRYPTO_RELATED_TYPE_PUBLIC_KEY = 4;
+ CRYPTO_RELATED_TYPE_SECRET_KEY = 5;
+ CRYPTO_RELATED_TYPE_KEY = 6;
+ CRYPTO_RELATED_TYPE_CIPHERTEXT = 7;
+ CRYPTO_RELATED_TYPE_SIGNATURE = 8;
+ CRYPTO_RELATED_TYPE_DIGEST = 9;
+ CRYPTO_RELATED_TYPE_INITIALIZATION_VECTOR = 10;
+ CRYPTO_RELATED_TYPE_NONCE = 11;
+ CRYPTO_RELATED_TYPE_SEED = 12;
+ CRYPTO_RELATED_TYPE_SALT = 13;
+ CRYPTO_RELATED_TYPE_SHARED_SECRET = 14;
+ CRYPTO_RELATED_TYPE_TAG = 15;
+ CRYPTO_RELATED_TYPE_ADDITIONAL_DATA = 16;
+ CRYPTO_RELATED_TYPE_PASSWORD = 17;
+ CRYPTO_RELATED_TYPE_CREDENTIAL = 18;
+ CRYPTO_RELATED_TYPE_TOKEN = 19;
+ }
+ enum CryptoRelatedState {
+ // Default
+ CRYPTO_RELATED_STATE_UNSPECIFIED = 0;
+ CRYPTO_RELATED_STATE_PRE_ACTIVATION = 1;
+ CRYPTO_RELATED_STATE_ACTIVE = 2;
+ CRYPTO_RELATED_STATE_SUSPENDED = 3;
+ CRYPTO_RELATED_STATE_DEACTIVATED = 4;
+ CRYPTO_RELATED_STATE_COMPROMISED = 5;
+ CRYPTO_RELATED_STATE_DESTROYED = 6;
+ }
+ message CryptoRelatedSecuredBy {
+ // Specifies the mechanism by which the cryptographic asset is secured. Examples include HSM, TPM, SGX, Software, and None
+ optional string mechanism = 1;
+ // The bom-ref to the algorithm.
+ optional string algorithmRef = 2;
+ }
+ // The type for the related cryptographic material
+ optional CryptoRelatedType type = 1;
+ // The optional unique identifier for the related cryptographic material.
+ optional string id = 2;
+ // The key state as defined by NIST SP 800-57.
+ optional CryptoRelatedState state = 3;
+ // The bom-ref to the algorithm used to generate the related cryptographic material.
+ optional string algorithmRef = 4;
+ // The date and time (timestamp) when the related cryptographic material was created.
+ optional google.protobuf.Timestamp creationDate = 5;
+ // The date and time (timestamp) when the related cryptographic material was activated.
+ optional google.protobuf.Timestamp activationDate = 6;
+ // The date and time (timestamp) when the related cryptographic material was updated.
+ optional google.protobuf.Timestamp updateDate = 7;
+ // The date and time (timestamp) when the related cryptographic material expires.
+ optional google.protobuf.Timestamp expirationDate = 8;
+ // The associated value of the cryptographic material.
+ optional string value = 9;
+ // The size of the cryptographic asset (in bits).
+ optional int64 size = 10;
+ // The format of the related cryptographic material (e.g. P8, PEM, DER).
+ optional string format = 11;
+ // The mechanism by which the cryptographic asset is secured.
+ optional CryptoRelatedSecuredBy securedBy = 12;
+ } // end of RelatedCryptoMaterialProperties
+ message ProtocolProperties {
+ enum CryptoProtocolType {
+ // ProtoBuff's default value -- it differs from "unknown"
+ CRYPTO_PROTOCOL_TYPE_UNSPECIFIED = 0;
+ // The protocol type is not known
+ CRYPTO_PROTOCOL_TYPE_UNKNOWN = 1;
+ // Another protocol type - none of the following
+ CRYPTO_PROTOCOL_TYPE_OTHER = 2;
+ CRYPTO_PROTOCOL_TYPE_TLS = 3;
+ CRYPTO_PROTOCOL_TYPE_SSH = 4;
+ CRYPTO_PROTOCOL_TYPE_IPSEC = 5;
+ CRYPTO_PROTOCOL_TYPE_IKE = 6;
+ CRYPTO_PROTOCOL_TYPE_SSTP = 7;
+ CRYPTO_PROTOCOL_TYPE_WPA = 8;
+ }
+ message CryptoProtocolCipherSuite {
+ // A common name for the cipher suite. For example: TLS_DHE_RSA_WITH_AES_128_CCM
+ optional string name = 1;
+ // A list of algorithms related to the cipher suite. Use the bom-ref to the algorithm cryptographic asset.
+ repeated string algorithms = 2;
+ // A list of common identifiers for the cipher suite. For example: 0xC0 and 0x9E
+ repeated string identifiers = 3;
+ }
+ message Ikev2TransformTypes {
+ // Transform Type 1: encryption algorithms
+ repeated string encr = 1;
+ // Transform Type 2: pseudorandom functions
+ repeated string prf = 2;
+ // Transform Type 3: integrity algorithms
+ repeated string integ = 3;
+ // Transform Type 4: Key Exchange Method (KE) per RFC9370, formerly called Diffie-Hellman Group (D-H)
+ repeated string ke = 4;
+ // Specifies if an Extended Sequence Number (ESN) is used.
+ optional bool esn = 5;
+ // IKEv2 Authentication method
+ repeated string auth = 6;
+ }
+ // The concrete protocol type.
+ optional CryptoProtocolType type = 1;
+ // The version of the protocol. Examples include 1.0, 1.2, and 1.99.
+ optional string version = 2;
+ // A list of cipher suites related to the protocol.
+ repeated CryptoProtocolCipherSuite cipherSuites = 3;
+ // The IKEv2 transform types supported (types 1-4), defined in RFC7296 section 3.3.2, and additional properties.
+ optional Ikev2TransformTypes ikev2TransformTypes = 4;
+ // The bom-ref(s) to protocol-related cryptographic assets
+ repeated string cryptoRef = 5;
+ } // end of ProtocolProperties
+ // Cryptographic assets occur in several forms. Algorithms and protocols are most commonly implemented in specialized cryptographic libraries. They may, however, also be 'hardcoded' in software components. Certificates and related cryptographic material like keys, tokens, secrets or passwords are other cryptographic assets to be modelled.
+ CryptoAssetType assetType = 1;
+ // Additional properties specific to a cryptographic algorithm.
+ optional AlgorithmProperties algorithmProperties = 2;
+ // Properties for cryptographic assets of asset type 'certificate'
+ optional CertificateProperties certificateProperties = 3;
+ // Properties for cryptographic assets of asset type: `related-crypto-material`
+ optional RelatedCryptoMaterialProperties relatedCryptoMaterialProperties = 4;
+ // Properties specific to cryptographic assets of type: `protocol`.
+ optional ProtocolProperties protocolProperties = 5;
+ // The object identifier (OID) of the cryptographic asset.
+ optional string oid = 6;
+}
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
new file mode 100644
index 00000000..b7c7212a
--- /dev/null
+++ b/schema/bom-1.7.schema.json
@@ -0,0 +1,5699 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "$id": "http://cyclonedx.org/schema/bom-1.7.schema.json",
+ "type": "object",
+ "title": "CycloneDX Bill of Materials Standard",
+ "$comment" : "CycloneDX JSON schema is published under the terms of the Apache License 2.0.",
+ "required": [
+ "bomFormat",
+ "specVersion"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "$schema": {
+ "type": "string"
+ },
+ "bomFormat": {
+ "type": "string",
+ "title": "BOM Format",
+ "description": "Specifies the format of the BOM. This helps to identify the file as CycloneDX since BOMs do not have a filename convention, nor does JSON schema support namespaces. This value must be \"CycloneDX\".",
+ "enum": [
+ "CycloneDX"
+ ]
+ },
+ "specVersion": {
+ "type": "string",
+ "title": "CycloneDX Specification Version",
+ "description": "The version of the CycloneDX specification the BOM conforms to.",
+ "examples": ["1.7"]
+ },
+ "serialNumber": {
+ "type": "string",
+ "title": "BOM Serial Number",
+ "description": "Every BOM generated SHOULD have a unique serial number, even if the contents of the BOM have not changed over time. If specified, the serial number must conform to [RFC 4122](https://www.ietf.org/rfc/rfc4122.html). Use of serial numbers is recommended.",
+ "examples": ["urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"],
+ "pattern": "^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"
+ },
+ "version": {
+ "type": "integer",
+ "title": "BOM Version",
+ "description": "Whenever an existing BOM is modified, either manually or through automated processes, the version of the BOM SHOULD be incremented by 1. When a system is presented with multiple BOMs with identical serial numbers, the system SHOULD use the most recent version of the BOM. The default version is '1'.",
+ "minimum": 1,
+ "default": 1,
+ "examples": [1]
+ },
+ "metadata": {
+ "$ref": "#/definitions/metadata",
+ "title": "BOM Metadata",
+ "description": "Provides additional information about a BOM."
+ },
+ "components": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/component"},
+ "uniqueItems": true,
+ "title": "Components",
+ "description": "A list of software and hardware components."
+ },
+ "services": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/service"},
+ "uniqueItems": true,
+ "title": "Services",
+ "description": "A list of services. This may include microservices, function-as-a-service, and other types of network or intra-process services."
+ },
+ "externalReferences": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/externalReference"},
+ "title": "External References",
+ "description": "External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM."
+ },
+ "dependencies": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/dependency"},
+ "uniqueItems": true,
+ "title": "Dependencies",
+ "description": "Provides the ability to document dependency relationships including provided & implemented components."
+ },
+ "compositions": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/compositions"},
+ "uniqueItems": true,
+ "title": "Compositions",
+ "description": "Compositions describe constituent parts (including components, services, and dependency relationships) and their completeness. The completeness of vulnerabilities expressed in a BOM may also be described."
+ },
+ "vulnerabilities": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/vulnerability"},
+ "uniqueItems": true,
+ "title": "Vulnerabilities",
+ "description": "Vulnerabilities identified in components or services."
+ },
+ "annotations": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/annotations"},
+ "uniqueItems": true,
+ "title": "Annotations",
+ "description": "Comments made by people, organizations, or tools about any object with a bom-ref, such as components, services, vulnerabilities, or the BOM itself. Unlike inventory information, annotations may contain opinions or commentary from various stakeholders. Annotations may be inline (with inventory) or externalized via BOM-Link and may optionally be signed."
+ },
+ "formulation": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/formula"},
+ "uniqueItems": true,
+ "title": "Formulation",
+ "description": "Describes how a component or service was manufactured or deployed. This is achieved through the use of formulas, workflows, tasks, and steps, which declare the precise steps to reproduce along with the observed formulas describing the steps which transpired in the manufacturing process."
+ },
+ "declarations": {
+ "type": "object",
+ "title": "Declarations",
+ "description": "The list of declarations which describe the conformance to standards. Each declaration may include attestations, claims, and evidence.",
+ "additionalProperties": false,
+ "properties": {
+ "assessors": {
+ "type": "array",
+ "title": "Assessors",
+ "description": "The list of assessors evaluating claims and determining conformance to requirements and confidence in that assessment.",
+ "items": {
+ "type": "object",
+ "title": "Assessor",
+ "description": "The assessor who evaluates claims and determines conformance to requirements and confidence in that assessment.",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the object elsewhere in the BOM. Every bom-ref must be unique within the BOM."
+ },
+ "thirdParty": {
+ "type": "boolean",
+ "title": "Third Party",
+ "description": "The boolean indicating if the assessor is outside the organization generating claims. A value of false indicates a self assessor."
+ },
+ "organization": {
+ "$ref": "#/definitions/organizationalEntity",
+ "title": "Organization",
+ "description": "The entity issuing the assessment."
+ }
+ }
+ }
+ },
+ "attestations": {
+ "type": "array",
+ "title": "Attestations",
+ "description": "The list of attestations asserted by an assessor that maps requirements to claims.",
+ "items": {
+ "type": "object",
+ "title": "Attestation",
+ "additionalProperties": false,
+ "properties": {
+ "summary": {
+ "type": "string",
+ "title": "Summary",
+ "description": "The short description explaining the main points of the attestation."
+ },
+ "assessor": {
+ "$ref": "#/definitions/refLinkType",
+ "title": "Assessor",
+ "description": "The `bom-ref` to the assessor asserting the attestation."
+ },
+ "map": {
+ "type": "array",
+ "title": "Map",
+ "description": "The grouping of requirements to claims and the attestors declared conformance and confidence thereof.",
+ "items": {
+ "type": "object",
+ "title": "Map",
+ "additionalProperties": false,
+ "properties": {
+ "requirement": {
+ "$ref": "#/definitions/refLinkType",
+ "title": "Requirement",
+ "description": "The `bom-ref` to the requirement being attested to."
+ },
+ "claims": {
+ "type": "array",
+ "title": "Claims",
+ "description": "The list of `bom-ref` to the claims being attested to.",
+ "items": { "$ref": "#/definitions/refLinkType" }
+ },
+ "counterClaims": {
+ "type": "array",
+ "title": "Counter Claims",
+ "description": "The list of `bom-ref` to the counter claims being attested to.",
+ "items": { "$ref": "#/definitions/refLinkType" }
+ },
+ "conformance": {
+ "type": "object",
+ "title": "Conformance",
+ "description": "The conformance of the claim meeting a requirement.",
+ "additionalProperties": false,
+ "properties": {
+ "score": {
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "title": "Score",
+ "description": "The conformance of the claim between and inclusive of 0 and 1, where 1 is 100% conformance."
+ },
+ "rationale": {
+ "type": "string",
+ "title": "Rationale",
+ "description": "The rationale for the conformance score."
+ },
+ "mitigationStrategies": {
+ "type": "array",
+ "title": "Mitigation Strategies",
+ "description": "The list of `bom-ref` to the evidence provided describing the mitigation strategies.",
+ "items": { "$ref": "#/definitions/refLinkType" }
+ }
+ }
+ },
+ "confidence": {
+ "type": "object",
+ "title": "Confidence",
+ "description": "The confidence of the claim meeting the requirement.",
+ "additionalProperties": false,
+ "properties": {
+ "score": {
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "title": "Score",
+ "description": "The confidence of the claim between and inclusive of 0 and 1, where 1 is 100% confidence."
+ },
+ "rationale": {
+ "type": "string",
+ "title": "Rationale",
+ "description": "The rationale for the confidence score."
+ }
+ }
+ }
+ }
+ }
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ }
+ }
+ }
+ },
+ "claims": {
+ "type": "array",
+ "title": "Claims",
+ "description": "The list of claims.",
+ "items": {
+ "type": "object",
+ "title": "Claim",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the object elsewhere in the BOM. Every bom-ref must be unique within the BOM."
+ },
+ "target": {
+ "$ref": "#/definitions/refLinkType",
+ "title": "Target",
+ "description": "The `bom-ref` to a target representing a specific system, application, API, module, team, person, process, business unit, company, etc... that this claim is being applied to."
+ },
+ "predicate": {
+ "type": "string",
+ "title": "Predicate",
+ "description": "The specific statement or assertion about the target."
+ },
+ "mitigationStrategies": {
+ "type": "array",
+ "title": "Mitigation Strategies",
+ "description": "The list of `bom-ref` to the evidence provided describing the mitigation strategies. Each mitigation strategy should include an explanation of how any weaknesses in the evidence will be mitigated.",
+ "items": { "$ref": "#/definitions/refLinkType" }
+ },
+ "reasoning": {
+ "type": "string",
+ "title": "Reasoning",
+ "description": "The written explanation of why the evidence provided substantiates the claim."
+ },
+ "evidence": {
+ "type": "array",
+ "title": "Evidence",
+ "description": "The list of `bom-ref` to evidence that supports this claim.",
+ "items": { "$ref": "#/definitions/refLinkType" }
+ },
+ "counterEvidence": {
+ "type": "array",
+ "title": "Counter Evidence",
+ "description": "The list of `bom-ref` to counterEvidence that supports this claim.",
+ "items": { "$ref": "#/definitions/refLinkType" }
+ },
+ "externalReferences": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/externalReference"},
+ "title": "External References",
+ "description": "External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM."
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ }
+ }
+ }
+ },
+ "evidence": {
+ "type": "array",
+ "title": "Evidence",
+ "description": "The list of evidence",
+ "items": {
+ "type": "object",
+ "title": "Evidence",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the object elsewhere in the BOM. Every bom-ref must be unique within the BOM."
+ },
+ "propertyName": {
+ "type": "string",
+ "title": "Property Name",
+ "description": "The reference to the property name as defined in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy/)."
+ },
+ "description": {
+ "type": "string",
+ "title": "Description",
+ "description": "The written description of what this evidence is and how it was created."
+ },
+ "data": {
+ "type": "array",
+ "title": "Data",
+ "description": "The output or analysis that supports claims.",
+ "items": {
+ "type": "object",
+ "title": "Data",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "title": "Data Name",
+ "description": "The name of the data.",
+ "type": "string"
+ },
+ "contents": {
+ "type": "object",
+ "title": "Data Contents",
+ "description": "The contents or references to the contents of the data being described.",
+ "additionalProperties": false,
+ "properties": {
+ "attachment": {
+ "title": "Data Attachment",
+ "description": "An optional way to include textual or encoded data.",
+ "$ref": "#/definitions/attachment"
+ },
+ "url": {
+ "type": "string",
+ "title": "Data URL",
+ "description": "The URL to where the data can be retrieved.",
+ "format": "iri-reference"
+ }
+ }
+ },
+ "classification": {
+ "$ref": "#/definitions/dataClassification"
+ },
+ "sensitiveData": {
+ "type": "array",
+ "title": "Sensitive Data",
+ "description": "A description of any sensitive data included.",
+ "items": {
+ "type": "string"
+ }
+ },
+ "governance": {
+ "title": "Data Governance",
+ "$ref": "#/definitions/dataGovernance"
+ }
+ }
+ }
+ },
+ "created": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Created",
+ "description": "The date and time (timestamp) when the evidence was created."
+ },
+ "expires": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Expires",
+ "description": "The optional date and time (timestamp) when the evidence is no longer valid."
+ },
+ "author": {
+ "$ref": "#/definitions/organizationalContact",
+ "title": "Author",
+ "description": "The author of the evidence."
+ },
+ "reviewer": {
+ "$ref": "#/definitions/organizationalContact",
+ "title": "Reviewer",
+ "description": "The reviewer of the evidence."
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ }
+ }
+ }
+ },
+ "targets": {
+ "type": "object",
+ "title": "Targets",
+ "description": "The list of targets which claims are made against.",
+ "additionalProperties": false,
+ "properties": {
+ "organizations": {
+ "type": "array",
+ "title": "Organizations",
+ "description": "The list of organizations which claims are made against.",
+ "items": {"$ref": "#/definitions/organizationalEntity"}
+ },
+ "components": {
+ "type": "array",
+ "title": "Components",
+ "description": "The list of components which claims are made against.",
+ "items": {"$ref": "#/definitions/component"}
+ },
+ "services": {
+ "type": "array",
+ "title": "Services",
+ "description": "The list of services which claims are made against.",
+ "items": {"$ref": "#/definitions/service"}
+ }
+ }
+ },
+ "affirmation": {
+ "type": "object",
+ "title": "Affirmation",
+ "description": "A concise statement affirmed by an individual regarding all declarations, often used for third-party auditor acceptance or recipient acknowledgment. It includes a list of authorized signatories who assert the validity of the document on behalf of the organization.",
+ "additionalProperties": false,
+ "properties": {
+ "statement": {
+ "type": "string",
+ "title": "Statement",
+ "description": "The brief statement affirmed by an individual regarding all declarations.\n*- Notes This could be an affirmation of acceptance by a third-party auditor or receiving individual of a file.",
+ "examples": [ "I certify, to the best of my knowledge, that all information is correct." ]
+ },
+ "signatories": {
+ "type": "array",
+ "title": "Signatories",
+ "description": "The list of signatories authorized on behalf of an organization to assert validity of this document.",
+ "items": {
+ "type": "object",
+ "title": "Signatory",
+ "additionalProperties": false,
+ "oneOf": [
+ {
+ "required": ["signature"]
+ },
+ {
+ "required": ["externalReference", "organization"]
+ }
+ ],
+ "properties": {
+ "name": {
+ "type": "string",
+ "title": "Name",
+ "description": "The signatory's name."
+ },
+ "role": {
+ "type": "string",
+ "title": "Role",
+ "description": "The signatory's role within an organization."
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ },
+ "organization": {
+ "$ref": "#/definitions/organizationalEntity",
+ "title": "Organization",
+ "description": "The signatory's organization."
+ },
+ "externalReference": {
+ "$ref": "#/definitions/externalReference",
+ "title": "External Reference",
+ "description": "External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM."
+ }
+ }
+ }
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ }
+ }
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ }
+ }
+ },
+ "definitions": {
+ "type": "object",
+ "title": "Definitions",
+ "description": "A collection of reusable objects that are defined and may be used elsewhere in the BOM.",
+ "additionalProperties": false,
+ "properties": {
+ "standards": {
+ "type": "array",
+ "title": "Standards",
+ "description": "The list of standards which may consist of regulations, industry or organizational-specific standards, maturity models, best practices, or any other requirements which can be evaluated against or attested to.",
+ "items": {
+ "$ref": "#/definitions/standard"
+ }
+ }
+ }
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ }
+ },
+ "definitions": {
+ "refType": {
+ "description": "Identifier for referable and therefore interlinkable elements.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links.",
+ "type": "string",
+ "minLength": 1,
+ "$comment": "TODO (breaking change): add a format constraint that prevents the value from staring with 'urn:cdx:'"
+ },
+ "refLinkType": {
+ "description": "Descriptor for an element identified by the attribute 'bom-ref' in the same BOM document.\nIn contrast to `bomLinkElementType`.",
+ "$ref": "#/definitions/refType"
+ },
+ "bomLinkDocumentType": {
+ "title": "BOM-Link Document",
+ "description": "Descriptor for another BOM document. See https://cyclonedx.org/capabilities/bomlink/",
+ "type": "string",
+ "format": "iri-reference",
+ "pattern": "^urn:cdx:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/[1-9][0-9]*$",
+ "$comment": "part of the pattern is based on `bom.serialNumber`'s pattern"
+ },
+ "bomLinkElementType": {
+ "title": "BOM-Link Element",
+ "description": "Descriptor for an element in a BOM document. See https://cyclonedx.org/capabilities/bomlink/",
+ "type": "string",
+ "format": "iri-reference",
+ "pattern": "^urn:cdx:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/[1-9][0-9]*#.+$",
+ "$comment": "part of the pattern is based on `bom.serialNumber`'s pattern"
+ },
+ "bomLink": {
+ "title": "BOM-Link",
+ "anyOf": [
+ {
+ "title": "BOM-Link Document",
+ "$ref": "#/definitions/bomLinkDocumentType"
+ },
+ {
+ "title": "BOM-Link Element",
+ "$ref": "#/definitions/bomLinkElementType"
+ }
+ ]
+ },
+ "metadata": {
+ "type": "object",
+ "title": "BOM Metadata",
+ "additionalProperties": false,
+ "properties": {
+ "timestamp": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Timestamp",
+ "description": "The date and time (timestamp) when the BOM was created."
+ },
+ "lifecycles": {
+ "type": "array",
+ "title": "Lifecycles",
+ "description": "Lifecycles communicate the stage(s) in which data in the BOM was captured. Different types of data may be available at various phases of a lifecycle, such as the Software Development Lifecycle (SDLC), IT Asset Management (ITAM), and Software Asset Management (SAM). Thus, a BOM may include data specific to or only obtainable in a given lifecycle.",
+ "items": {
+ "type": "object",
+ "title": "Lifecycle",
+ "description": "The product lifecycle(s) that this BOM represents.",
+ "oneOf": [
+ {
+ "title": "Pre-Defined Phase",
+ "required": ["phase"],
+ "additionalProperties": false,
+ "properties": {
+ "phase": {
+ "type": "string",
+ "title": "Phase",
+ "description": "A pre-defined phase in the product lifecycle.",
+ "enum": [
+ "design",
+ "pre-build",
+ "build",
+ "post-build",
+ "operations",
+ "discovery",
+ "decommission"
+ ],
+ "meta:enum": {
+ "design": "BOM produced early in the development lifecycle containing an inventory of components and services that are proposed or planned to be used. The inventory may need to be procured, retrieved, or resourced prior to use.",
+ "pre-build": "BOM consisting of information obtained prior to a build process and may contain source files and development artifacts and manifests. The inventory may need to be resolved and retrieved prior to use.",
+ "build": "BOM consisting of information obtained during a build process where component inventory is available for use. The precise versions of resolved components are usually available at this time as well as the provenance of where the components were retrieved from.",
+ "post-build": "BOM consisting of information obtained after a build process has completed and the resulting components(s) are available for further analysis. Built components may exist as the result of a CI/CD process, may have been installed or deployed to a system or device, and may need to be retrieved or extracted from the system or device.",
+ "operations": "BOM produced that represents inventory that is running and operational. This may include staging or production environments and will generally encompass multiple SBOMs describing the applications and operating system, along with HBOMs describing the hardware that makes up the system. Operations Bill of Materials (OBOM) can provide full-stack inventory of runtime environments, configurations, and additional dependencies.",
+ "discovery": "BOM consisting of information observed through network discovery providing point-in-time enumeration of embedded, on-premise, and cloud-native services such as server applications, connected devices, microservices, and serverless functions.",
+ "decommission": "BOM containing inventory that will be, or has been retired from operations."
+ }
+ }
+ }
+ },
+ {
+ "title": "Custom Phase",
+ "required": ["name"],
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "type": "string",
+ "title": "Name",
+ "description": "The name of the lifecycle phase"
+ },
+ "description": {
+ "type": "string",
+ "title": "Description",
+ "description": "The description of the lifecycle phase"
+ }
+ }
+ }
+ ]
+ }
+ },
+ "tools": {
+ "title": "Tools",
+ "description": "The tool(s) used in the creation, enrichment, and validation of the BOM.",
+ "oneOf": [
+ {
+ "type": "object",
+ "title": "Tools",
+ "description": "The tool(s) used in the creation, enrichment, and validation of the BOM.",
+ "additionalProperties": false,
+ "properties": {
+ "components": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/component"},
+ "uniqueItems": true,
+ "title": "Components",
+ "description": "A list of software and hardware components used as tools."
+ },
+ "services": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/service"},
+ "uniqueItems": true,
+ "title": "Services",
+ "description": "A list of services used as tools. This may include microservices, function-as-a-service, and other types of network or intra-process services."
+ }
+ }
+ },
+ {
+ "type": "array",
+ "title": "Tools (legacy)",
+ "description": "[Deprecated] The tool(s) used in the creation, enrichment, and validation of the BOM.",
+ "items": {"$ref": "#/definitions/tool"}
+ }
+ ]
+ },
+ "manufacturer": {
+ "title": "BOM Manufacturer",
+ "description": "The organization that created the BOM.\nManufacturer is common in BOMs created through automated processes. BOMs created through manual means may have `@.authors` instead.",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "authors": {
+ "type": "array",
+ "title": "BOM Authors",
+ "description": "The person(s) who created the BOM.\nAuthors are common in BOMs created through manual processes. BOMs created through automated means may have `@.manufacturer` instead.",
+ "items": {"$ref": "#/definitions/organizationalContact"}
+ },
+ "component": {
+ "title": "Component",
+ "description": "The component that the BOM describes.",
+ "$ref": "#/definitions/component"
+ },
+ "manufacture": {
+ "deprecated": true,
+ "title": "Component Manufacture (legacy)",
+ "description": "[Deprecated] This will be removed in a future version. Use the `@.component.manufacturer` instead.\nThe organization that manufactured the component that the BOM describes.",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "supplier": {
+ "title": "Supplier",
+ "description": " The organization that supplied the component that the BOM describes. The supplier may often be the manufacturer, but may also be a distributor or repackager.",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "licenses": {
+ "title": "BOM License(s)",
+ "description": "The license information for the BOM document.\nThis may be different from the license(s) of the component(s) that the BOM describes.",
+ "$ref": "#/definitions/licenseChoice"
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {"$ref": "#/definitions/property"}
+ }
+ }
+ },
+ "tool": {
+ "type": "object",
+ "title": "Tool",
+ "description": "[Deprecated] This will be removed in a future version. Use component or service instead. Information about the automated or manual tool used",
+ "additionalProperties": false,
+ "properties": {
+ "vendor": {
+ "type": "string",
+ "title": "Tool Vendor",
+ "description": "The name of the vendor who created the tool"
+ },
+ "name": {
+ "type": "string",
+ "title": "Tool Name",
+ "description": "The name of the tool"
+ },
+ "version": {
+ "$ref": "#/definitions/version",
+ "title": "Tool Version",
+ "description": "The version of the tool"
+ },
+ "hashes": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/hash"},
+ "title": "Hashes",
+ "description": "The hashes of the tool (if applicable)."
+ },
+ "externalReferences": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/externalReference"},
+ "title": "External References",
+ "description": "External references provide a way to document systems, sites, and information that may be relevant, but are not included with the BOM. They may also establish specific relationships within or external to the BOM."
+ }
+ }
+ },
+ "organizationalEntity": {
+ "type": "object",
+ "title": "Organizational Entity",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the object elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ },
+ "name": {
+ "type": "string",
+ "title": "Organization Name",
+ "description": "The name of the organization",
+ "examples": [
+ "Example Inc."
+ ]
+ },
+ "address": {
+ "$ref": "#/definitions/postalAddress",
+ "title": "Organization Address",
+ "description": "The physical address (location) of the organization"
+ },
+ "url": {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "format": "iri-reference"
+ },
+ "title": "Organization URL(s)",
+ "description": "The URL of the organization. Multiple URLs are allowed.",
+ "examples": ["https://example.com"]
+ },
+ "contact": {
+ "type": "array",
+ "title": "Organizational Contact",
+ "description": "A contact at the organization. Multiple contacts are allowed.",
+ "items": {"$ref": "#/definitions/organizationalContact"}
+ }
+ }
+ },
+ "organizationalContact": {
+ "type": "object",
+ "title": "Organizational Contact",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the object elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ },
+ "name": {
+ "type": "string",
+ "title": "Name",
+ "description": "The name of a contact",
+ "examples": ["Contact name"]
+ },
+ "email": {
+ "type": "string",
+ "format": "idn-email",
+ "title": "Email Address",
+ "description": "The email address of the contact.",
+ "examples": ["firstname.lastname@example.com"]
+ },
+ "phone": {
+ "type": "string",
+ "title": "Phone",
+ "description": "The phone number of the contact.",
+ "examples": ["800-555-1212"]
+ }
+ }
+ },
+ "component": {
+ "type": "object",
+ "title": "Component",
+ "required": [
+ "type",
+ "name"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "type": {
+ "type": "string",
+ "enum": [
+ "application",
+ "framework",
+ "library",
+ "container",
+ "platform",
+ "operating-system",
+ "device",
+ "device-driver",
+ "firmware",
+ "file",
+ "machine-learning-model",
+ "data",
+ "cryptographic-asset"
+ ],
+ "meta:enum": {
+ "application": "A software application. Refer to [https://en.wikipedia.org/wiki/Application_software](https://en.wikipedia.org/wiki/Application_software) for information about applications.",
+ "framework": "A software framework. Refer to [https://en.wikipedia.org/wiki/Software_framework](https://en.wikipedia.org/wiki/Software_framework) for information on how frameworks vary slightly from libraries.",
+ "library": "A software library. Refer to [https://en.wikipedia.org/wiki/Library_(computing)](https://en.wikipedia.org/wiki/Library_(computing)) for information about libraries. All third-party and open source reusable components will likely be a library. If the library also has key features of a framework, then it should be classified as a framework. If not, or is unknown, then specifying library is recommended.",
+ "container": "A packaging and/or runtime format, not specific to any particular technology, which isolates software inside the container from software outside of a container through virtualization technology. Refer to [https://en.wikipedia.org/wiki/OS-level_virtualization](https://en.wikipedia.org/wiki/OS-level_virtualization).",
+ "platform": "A runtime environment which interprets or executes software. This may include runtimes such as those that execute bytecode or low-code/no-code application platforms.",
+ "operating-system": "A software operating system without regard to deployment model (i.e. installed on physical hardware, virtual machine, image, etc) Refer to [https://en.wikipedia.org/wiki/Operating_system](https://en.wikipedia.org/wiki/Operating_system).",
+ "device": "A hardware device such as a processor or chip-set. A hardware device containing firmware SHOULD include a component for the physical hardware itself and another component of type 'firmware' or 'operating-system' (whichever is relevant), describing information about the software running on the device. See also the list of [known device properties](https://github.com/CycloneDX/cyclonedx-property-taxonomy/blob/main/cdx/device.md).",
+ "device-driver": "A special type of software that operates or controls a particular type of device. Refer to [https://en.wikipedia.org/wiki/Device_driver](https://en.wikipedia.org/wiki/Device_driver).",
+ "firmware": "A special type of software that provides low-level control over a device's hardware. Refer to [https://en.wikipedia.org/wiki/Firmware](https://en.wikipedia.org/wiki/Firmware).",
+ "file": "A computer file. Refer to [https://en.wikipedia.org/wiki/Computer_file](https://en.wikipedia.org/wiki/Computer_file) for information about files.",
+ "machine-learning-model": "A model based on training data that can make predictions or decisions without being explicitly programmed to do so.",
+ "data": "A collection of discrete values that convey information.",
+ "cryptographic-asset": "A cryptographic asset including algorithms, protocols, certificates, keys, tokens, and secrets."
+ },
+ "title": "Component Type",
+ "description": "Specifies the type of component. For software components, classify as application if no more specific appropriate classification is available or cannot be determined for the component.",
+ "examples": ["library"]
+ },
+ "mime-type": {
+ "type": "string",
+ "title": "Mime-Type",
+ "description": "The optional mime-type of the component. When used on file components, the mime-type can provide additional context about the kind of file being represented, such as an image, font, or executable. Some library or framework components may also have an associated mime-type.",
+ "examples": ["image/jpeg"],
+ "pattern": "^[-+a-z0-9.]+/[-+a-z0-9.]+$"
+ },
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the component elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ },
+ "supplier": {
+ "title": "Component Supplier",
+ "description": " The organization that supplied the component. The supplier may often be the manufacturer, but may also be a distributor or repackager.",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "manufacturer": {
+ "title": "Component Manufacturer",
+ "description": "The organization that created the component.\nManufacturer is common in components created through automated processes. Components created through manual means may have `@.authors` instead.",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "authors" :{
+ "type": "array",
+ "title": "Component Authors",
+ "description": "The person(s) who created the component.\nAuthors are common in components created through manual processes. Components created through automated means may have `@.manufacturer` instead.",
+ "items": {"$ref": "#/definitions/organizationalContact"}
+ },
+ "author": {
+ "deprecated": true,
+ "type": "string",
+ "title": "Component Author (legacy)",
+ "description": "[Deprecated] This will be removed in a future version. Use `@.authors` or `@.manufacturer` instead.\nThe person(s) or organization(s) that authored the component",
+ "examples": ["Acme Inc"]
+ },
+ "publisher": {
+ "type": "string",
+ "title": "Component Publisher",
+ "description": "The person(s) or organization(s) that published the component",
+ "examples": ["Acme Inc"]
+ },
+ "group": {
+ "type": "string",
+ "title": "Component Group",
+ "description": "The grouping name or identifier. This will often be a shortened, single name of the company or project that produced the component, or the source package or domain name. Whitespace and special characters should be avoided. Examples include: apache, org.apache.commons, and apache.org.",
+ "examples": ["com.acme"]
+ },
+ "name": {
+ "type": "string",
+ "title": "Component Name",
+ "description": "The name of the component. This will often be a shortened, single name of the component. Examples: commons-lang3 and jquery",
+ "examples": ["tomcat-catalina"]
+ },
+ "version": {
+ "$ref": "#/definitions/version",
+ "title": "Component Version",
+ "description": "The component version. The version should ideally comply with semantic versioning but is not enforced."
+ },
+ "description": {
+ "type": "string",
+ "title": "Component Description",
+ "description": "Specifies a description for the component"
+ },
+ "scope": {
+ "type": "string",
+ "enum": [
+ "required",
+ "optional",
+ "excluded"
+ ],
+ "meta:enum": {
+ "required": "The component is required for runtime",
+ "optional": "The component is optional at runtime. Optional components are components that are not capable of being called due to them not being installed or otherwise accessible by any means. Components that are installed but due to configuration or other restrictions are prohibited from being called must be scoped as 'required'.",
+ "excluded": "Components that are excluded provide the ability to document component usage for test and other non-runtime purposes. Excluded components are not reachable within a call graph at runtime."
+ },
+ "title": "Component Scope",
+ "description": "Specifies the scope of the component. If scope is not specified, 'required' scope SHOULD be assumed by the consumer of the BOM.",
+ "default": "required"
+ },
+ "hashes": {
+ "type": "array",
+ "title": "Component Hashes",
+ "description": "The hashes of the component.",
+ "items": {"$ref": "#/definitions/hash"}
+ },
+ "licenses": {
+ "$ref": "#/definitions/licenseChoice",
+ "title": "Component License(s)"
+ },
+ "copyright": {
+ "type": "string",
+ "title": "Component Copyright",
+ "description": "A copyright notice informing users of the underlying claims to copyright ownership in a published work.",
+ "examples": ["Acme Inc"]
+ },
+ "cpe": {
+ "type": "string",
+ "title": "Common Platform Enumeration (CPE)",
+ "description": "Asserts the identity of the component using CPE. The CPE must conform to the CPE 2.2 or 2.3 specification. See [https://nvd.nist.gov/products/cpe](https://nvd.nist.gov/products/cpe). Refer to `@.evidence.identity` to optionally provide evidence that substantiates the assertion of the component's identity.",
+ "examples": ["cpe:2.3:a:acme:component_framework:-:*:*:*:*:*:*:*"]
+ },
+ "purl": {
+ "type": "string",
+ "title": "Package URL (purl)",
+ "description": "Asserts the identity of the component using package-url (purl). The purl, if specified, must be valid and conform to the specification defined at: [https://github.com/package-url/purl-spec](https://github.com/package-url/purl-spec). Refer to `@.evidence.identity` to optionally provide evidence that substantiates the assertion of the component's identity.",
+ "examples": ["pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"]
+ },
+ "omniborId": {
+ "type": "array",
+ "title": "OmniBOR Artifact Identifier (gitoid)",
+ "description": "Asserts the identity of the component using the OmniBOR Artifact ID. The OmniBOR, if specified, must be valid and conform to the specification defined at: [https://www.iana.org/assignments/uri-schemes/prov/gitoid](https://www.iana.org/assignments/uri-schemes/prov/gitoid). Refer to `@.evidence.identity` to optionally provide evidence that substantiates the assertion of the component's identity.",
+ "items": { "type": "string" },
+ "examples": [
+ "gitoid:blob:sha1:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3",
+ "gitoid:blob:sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
+ ]
+ },
+ "swhid": {
+ "type": "array",
+ "title": "Software Heritage Identifier",
+ "description": "Asserts the identity of the component using the Software Heritage persistent identifier (SWHID). The SWHID, if specified, must be valid and conform to the specification defined at: [https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html](https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html). Refer to `@.evidence.identity` to optionally provide evidence that substantiates the assertion of the component's identity.",
+ "items": { "type": "string" },
+ "examples": ["swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2"]
+ },
+ "swid": {
+ "$ref": "#/definitions/swid",
+ "title": "SWID Tag",
+ "description": "Asserts the identity of the component using [ISO-IEC 19770-2 Software Identification (SWID) Tags](https://www.iso.org/standard/65666.html). Refer to `@.evidence.identity` to optionally provide evidence that substantiates the assertion of the component's identity."
+ },
+ "modified": {
+ "type": "boolean",
+ "title": "Component Modified From Original",
+ "description": "[Deprecated] This will be removed in a future version. Use the pedigree element instead to supply information on exactly how the component was modified. A boolean value indicating if the component has been modified from the original. A value of true indicates the component is a derivative of the original. A value of false indicates the component has not been modified from the original."
+ },
+ "pedigree": {
+ "type": "object",
+ "title": "Component Pedigree",
+ "description": "Component pedigree is a way to document complex supply chain scenarios where components are created, distributed, modified, redistributed, combined with other components, etc. Pedigree supports viewing this complex chain from the beginning, the end, or anywhere in the middle. It also provides a way to document variants where the exact relation may not be known.",
+ "additionalProperties": false,
+ "properties": {
+ "ancestors": {
+ "type": "array",
+ "title": "Ancestors",
+ "description": "Describes zero or more components in which a component is derived from. This is commonly used to describe forks from existing projects where the forked version contains a ancestor node containing the original component it was forked from. For example, Component A is the original component. Component B is the component being used and documented in the BOM. However, Component B contains a pedigree node with a single ancestor documenting Component A - the original component from which Component B is derived from.",
+ "items": {"$ref": "#/definitions/component"}
+ },
+ "descendants": {
+ "type": "array",
+ "title": "Descendants",
+ "description": "Descendants are the exact opposite of ancestors. This provides a way to document all forks (and their forks) of an original or root component.",
+ "items": {"$ref": "#/definitions/component"}
+ },
+ "variants": {
+ "type": "array",
+ "title": "Variants",
+ "description": "Variants describe relations where the relationship between the components is not known. For example, if Component A contains nearly identical code to Component B. They are both related, but it is unclear if one is derived from the other, or if they share a common ancestor.",
+ "items": {"$ref": "#/definitions/component"}
+ },
+ "commits": {
+ "type": "array",
+ "title": "Commits",
+ "description": "A list of zero or more commits which provide a trail describing how the component deviates from an ancestor, descendant, or variant.",
+ "items": {"$ref": "#/definitions/commit"}
+ },
+ "patches": {
+ "type": "array",
+ "title": "Patches",
+ "description": ">A list of zero or more patches describing how the component deviates from an ancestor, descendant, or variant. Patches may be complementary to commits or may be used in place of commits.",
+ "items": {"$ref": "#/definitions/patch"}
+ },
+ "notes": {
+ "type": "string",
+ "title": "Notes",
+ "description": "Notes, observations, and other non-structured commentary describing the components pedigree."
+ }
+ }
+ },
+ "externalReferences": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/externalReference"},
+ "title": "External References",
+ "description": "External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM."
+ },
+ "components": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/component"},
+ "uniqueItems": true,
+ "title": "Components",
+ "description": "A list of software and hardware components included in the parent component. This is not a dependency tree. It provides a way to specify a hierarchical representation of component assemblies, similar to system → subsystem → parts assembly in physical supply chains."
+ },
+ "evidence": {
+ "$ref": "#/definitions/componentEvidence",
+ "title": "Evidence",
+ "description": "Provides the ability to document evidence collected through various forms of extraction or analysis."
+ },
+ "releaseNotes": {
+ "$ref": "#/definitions/releaseNotes",
+ "title": "Release notes",
+ "description": "Specifies optional release notes."
+ },
+ "modelCard": {
+ "$ref": "#/definitions/modelCard",
+ "title": "AI/ML Model Card"
+ },
+ "data": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/componentData"},
+ "title": "Data",
+ "description": "This object SHOULD be specified for any component of type `data` and must not be specified for other component types."
+ },
+ "cryptoProperties": {
+ "$ref": "#/definitions/cryptoProperties",
+ "title": "Cryptographic Properties"
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {"$ref": "#/definitions/property"}
+ },
+ "tags": {
+ "$ref": "#/definitions/tags",
+ "title": "Tags"
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ }
+ }
+ },
+ "swid": {
+ "type": "object",
+ "title": "SWID Tag",
+ "description": "Specifies metadata and content for ISO-IEC 19770-2 Software Identification (SWID) Tags.",
+ "required": [
+ "tagId",
+ "name"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "tagId": {
+ "type": "string",
+ "title": "Tag ID",
+ "description": "Maps to the tagId of a SoftwareIdentity."
+ },
+ "name": {
+ "type": "string",
+ "title": "Name",
+ "description": "Maps to the name of a SoftwareIdentity."
+ },
+ "version": {
+ "type": "string",
+ "title": "Version",
+ "default": "0.0",
+ "description": "Maps to the version of a SoftwareIdentity."
+ },
+ "tagVersion": {
+ "type": "integer",
+ "title": "Tag Version",
+ "default": 0,
+ "description": "Maps to the tagVersion of a SoftwareIdentity."
+ },
+ "patch": {
+ "type": "boolean",
+ "title": "Patch",
+ "default": false,
+ "description": "Maps to the patch of a SoftwareIdentity."
+ },
+ "text": {
+ "title": "Attachment text",
+ "description": "Specifies the metadata and content of the SWID tag.",
+ "$ref": "#/definitions/attachment"
+ },
+ "url": {
+ "type": "string",
+ "title": "URL",
+ "description": "The URL to the SWID file.",
+ "format": "iri-reference"
+ }
+ }
+ },
+ "attachment": {
+ "type": "object",
+ "title": "Attachment",
+ "description": "Specifies the metadata and content for an attachment.",
+ "required": [
+ "content"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "contentType": {
+ "type": "string",
+ "title": "Content-Type",
+ "description": "Specifies the format and nature of the data being attached, helping systems correctly interpret and process the content. Common content type examples include `application/json` for JSON data and `text/plain` for plan text documents. [RFC 2045 section 5.1](https://www.ietf.org/rfc/rfc2045.html#section-5.1) outlines the structure and use of content types. For a comprehensive list of registered content types, refer to the [IANA media types registry](https://www.iana.org/assignments/media-types/media-types.xhtml).",
+ "default": "text/plain",
+ "examples": [
+ "text/plain",
+ "application/json",
+ "image/png"
+ ]
+ },
+ "encoding": {
+ "type": "string",
+ "title": "Encoding",
+ "description": "Specifies the optional encoding the text is represented in.",
+ "enum": [
+ "base64"
+ ],
+ "meta:enum": {
+ "base64": "Base64 is a binary-to-text encoding scheme that represents binary data in an ASCII string."
+ }
+ },
+ "content": {
+ "type": "string",
+ "title": "Attachment Text",
+ "description": "The attachment data. Proactive controls such as input validation and sanitization should be employed to prevent misuse of attachment text."
+ }
+ }
+ },
+ "hash": {
+ "type": "object",
+ "title": "Hash",
+ "required": [
+ "alg",
+ "content"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "alg": {
+ "$ref": "#/definitions/hash-alg"
+ },
+ "content": {
+ "$ref": "#/definitions/hash-content"
+ }
+ }
+ },
+ "hash-alg": {
+ "type": "string",
+ "title": "Hash Algorithm",
+ "description": "The algorithm that generated the hash value.",
+ "enum": [
+ "MD5",
+ "SHA-1",
+ "SHA-256",
+ "SHA-384",
+ "SHA-512",
+ "SHA3-256",
+ "SHA3-384",
+ "SHA3-512",
+ "BLAKE2b-256",
+ "BLAKE2b-384",
+ "BLAKE2b-512",
+ "BLAKE3"
+ ]
+ },
+ "hash-content": {
+ "type": "string",
+ "title": "Hash Value",
+ "description": "The value of the hash.",
+ "examples": ["3942447fac867ae5cdb3229b658f4d48"],
+ "pattern": "^([a-fA-F0-9]{32}|[a-fA-F0-9]{40}|[a-fA-F0-9]{64}|[a-fA-F0-9]{96}|[a-fA-F0-9]{128})$"
+ },
+ "license": {
+ "type": "object",
+ "title": "License",
+ "description": "Specifies the details and attributes related to a software license. It can either include a valid SPDX license identifier or a named license, along with additional properties such as license acknowledgment, comprehensive commercial licensing information, and the full text of the license.",
+ "oneOf": [
+ {
+ "required": ["id"]
+ },
+ {
+ "required": ["name"]
+ }
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the license elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ },
+ "id": {
+ "$ref": "spdx.schema.json",
+ "title": "License ID (SPDX)",
+ "description": "A valid SPDX license identifier. If specified, this value must be one of the enumeration of valid SPDX license identifiers defined in the spdx.schema.json (or spdx.xml) subschema which is synchronized with the official SPDX license list.",
+ "examples": ["Apache-2.0"]
+ },
+ "name": {
+ "type": "string",
+ "title": "License Name",
+ "description": "The name of the license. This may include the name of a commercial or proprietary license or an open source license that may not be defined by SPDX.",
+ "examples": ["Acme Software License"]
+ },
+ "acknowledgement": {
+ "$ref": "#/definitions/licenseAcknowledgementEnumeration"
+ },
+ "text": {
+ "title": "License text",
+ "description": "An optional way to include the textual content of a license.",
+ "$ref": "#/definitions/attachment"
+ },
+ "url": {
+ "type": "string",
+ "title": "License URL",
+ "description": "The URL to the license file. If specified, a 'license' externalReference should also be specified for completeness",
+ "examples": ["https://www.apache.org/licenses/LICENSE-2.0.txt"],
+ "format": "iri-reference"
+ },
+ "licensing": {
+ "type": "object",
+ "title": "Licensing information",
+ "description": "Licensing details describing the licensor/licensee, license type, renewal and expiration dates, and other important metadata",
+ "additionalProperties": false,
+ "properties": {
+ "altIds": {
+ "type": "array",
+ "title": "Alternate License Identifiers",
+ "description": "License identifiers that may be used to manage licenses and their lifecycle",
+ "items": {
+ "type": "string"
+ }
+ },
+ "licensor": {
+ "title": "Licensor",
+ "description": "The individual or organization that grants a license to another individual or organization",
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "organization": {
+ "title": "Licensor (Organization)",
+ "description": "The organization that granted the license",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "individual": {
+ "title": "Licensor (Individual)",
+ "description": "The individual, not associated with an organization, that granted the license",
+ "$ref": "#/definitions/organizationalContact"
+ }
+ },
+ "oneOf":[
+ {
+ "required": ["organization"]
+ },
+ {
+ "required": ["individual"]
+ }
+ ]
+ },
+ "licensee": {
+ "title": "Licensee",
+ "description": "The individual or organization for which a license was granted to",
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "organization": {
+ "title": "Licensee (Organization)",
+ "description": "The organization that was granted the license",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "individual": {
+ "title": "Licensee (Individual)",
+ "description": "The individual, not associated with an organization, that was granted the license",
+ "$ref": "#/definitions/organizationalContact"
+ }
+ },
+ "oneOf":[
+ {
+ "required": ["organization"]
+ },
+ {
+ "required": ["individual"]
+ }
+ ]
+ },
+ "purchaser": {
+ "title": "Purchaser",
+ "description": "The individual or organization that purchased the license",
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "organization": {
+ "title": "Purchaser (Organization)",
+ "description": "The organization that purchased the license",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "individual": {
+ "title": "Purchaser (Individual)",
+ "description": "The individual, not associated with an organization, that purchased the license",
+ "$ref": "#/definitions/organizationalContact"
+ }
+ },
+ "oneOf":[
+ {
+ "required": ["organization"]
+ },
+ {
+ "required": ["individual"]
+ }
+ ]
+ },
+ "purchaseOrder": {
+ "type": "string",
+ "title": "Purchase Order",
+ "description": "The purchase order identifier the purchaser sent to a supplier or vendor to authorize a purchase"
+ },
+ "licenseTypes": {
+ "type": "array",
+ "title": "License Type",
+ "description": "The type of license(s) that was granted to the licensee.",
+ "items": {
+ "type": "string",
+ "enum": [
+ "academic",
+ "appliance",
+ "client-access",
+ "concurrent-user",
+ "core-points",
+ "custom-metric",
+ "device",
+ "evaluation",
+ "named-user",
+ "node-locked",
+ "oem",
+ "perpetual",
+ "processor-points",
+ "subscription",
+ "user",
+ "other"
+ ],
+ "meta:enum": {
+ "academic": "A license that grants use of software solely for the purpose of education or research.",
+ "appliance": "A license covering use of software embedded in a specific piece of hardware.",
+ "client-access": "A Client Access License (CAL) allows client computers to access services provided by server software.",
+ "concurrent-user": "A Concurrent User license (aka floating license) limits the number of licenses for a software application and licenses are shared among a larger number of users.",
+ "core-points": "A license where the core of a computer's processor is assigned a specific number of points.",
+ "custom-metric": "A license for which consumption is measured by non-standard metrics.",
+ "device": "A license that covers a defined number of installations on computers and other types of devices.",
+ "evaluation": "A license that grants permission to install and use software for trial purposes.",
+ "named-user": "A license that grants access to the software to one or more pre-defined users.",
+ "node-locked": "A license that grants access to the software on one or more pre-defined computers or devices.",
+ "oem": "An Original Equipment Manufacturer license that is delivered with hardware, cannot be transferred to other hardware, and is valid for the life of the hardware.",
+ "perpetual": "A license where the software is sold on a one-time basis and the licensee can use a copy of the software indefinitely.",
+ "processor-points": "A license where each installation consumes points per processor.",
+ "subscription": "A license where the licensee pays a fee to use the software or service.",
+ "user": "A license that grants access to the software or service by a specified number of users.",
+ "other": "Another license type."
+ }
+ }
+ },
+ "lastRenewal": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Last Renewal",
+ "description": "The timestamp indicating when the license was last renewed. For new purchases, this is often the purchase or acquisition date. For non-perpetual licenses or subscriptions, this is the timestamp of when the license was last renewed."
+ },
+ "expiration": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Expiration",
+ "description": "The timestamp indicating when the current license expires (if applicable)."
+ }
+ }
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {"$ref": "#/definitions/property"}
+ }
+ }
+ },
+ "licenseAcknowledgementEnumeration": {
+ "title": "License Acknowledgement",
+ "description": "Declared licenses and concluded licenses represent two different stages in the licensing process within software development. Declared licenses refer to the initial intention of the software authors regarding the licensing terms under which their code is released. On the other hand, concluded licenses are the result of a comprehensive analysis of the project's codebase to identify and confirm the actual licenses of the components used, which may differ from the initially declared licenses. While declared licenses provide an upfront indication of the licensing intentions, concluded licenses offer a more thorough understanding of the actual licensing within a project, facilitating proper compliance and risk management. Observed licenses are defined in `@.evidence.licenses`. Observed licenses form the evidence necessary to substantiate a concluded license.",
+ "type": "string",
+ "enum": [
+ "declared",
+ "concluded"
+ ],
+ "meta:enum": {
+ "declared": "Declared licenses represent the initial intentions of authors regarding the licensing terms of their code.",
+ "concluded": "Concluded licenses are verified and confirmed."
+ }
+ },
+ "licenseChoice": {
+ "title": "License Choice",
+ "description": "EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)",
+ "type": "array",
+ "oneOf": [
+ {
+ "title": "Multiple licenses",
+ "description": "A list of SPDX licenses and/or named licenses.",
+ "type": "array",
+ "items": {
+ "type": "object",
+ "title": "License",
+ "required": ["license"],
+ "additionalProperties": false,
+ "properties": {
+ "license": {"$ref": "#/definitions/license"}
+ }
+ }
+ },
+ {
+ "title": "SPDX License Expression",
+ "description": "A tuple of exactly one SPDX License Expression.",
+ "type": "array",
+ "additionalItems": false,
+ "minItems": 1,
+ "maxItems": 1,
+ "items": [{
+ "type": "object",
+ "additionalProperties": false,
+ "required": ["expression"],
+ "properties": {
+ "expression": {
+ "type": "string",
+ "title": "SPDX License Expression",
+ "description": "A valid SPDX license expression.\nRefer to https://spdx.org/specifications for syntax requirements",
+ "examples": [
+ "Apache-2.0 AND (MIT OR GPL-2.0-only)",
+ "GPL-3.0-only WITH Classpath-exception-2.0"
+ ]
+ },
+ "acknowledgement": {
+ "$ref": "#/definitions/licenseAcknowledgementEnumeration"
+ },
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the license elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ }
+ }
+ }]
+ }
+ ]
+ },
+ "commit": {
+ "type": "object",
+ "title": "Commit",
+ "description": "Specifies an individual commit",
+ "additionalProperties": false,
+ "properties": {
+ "uid": {
+ "type": "string",
+ "title": "UID",
+ "description": "A unique identifier of the commit. This may be version control specific. For example, Subversion uses revision numbers whereas git uses commit hashes."
+ },
+ "url": {
+ "type": "string",
+ "title": "URL",
+ "description": "The URL to the commit. This URL will typically point to a commit in a version control system.",
+ "format": "iri-reference"
+ },
+ "author": {
+ "title": "Author",
+ "description": "The author who created the changes in the commit",
+ "$ref": "#/definitions/identifiableAction"
+ },
+ "committer": {
+ "title": "Committer",
+ "description": "The person who committed or pushed the commit",
+ "$ref": "#/definitions/identifiableAction"
+ },
+ "message": {
+ "type": "string",
+ "title": "Message",
+ "description": "The text description of the contents of the commit"
+ }
+ }
+ },
+ "patch": {
+ "type": "object",
+ "title": "Patch",
+ "description": "Specifies an individual patch",
+ "required": [
+ "type"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "type": {
+ "type": "string",
+ "enum": [
+ "unofficial",
+ "monkey",
+ "backport",
+ "cherry-pick"
+ ],
+ "meta:enum": {
+ "unofficial": "A patch which is not developed by the creators or maintainers of the software being patched. Refer to [https://en.wikipedia.org/wiki/Unofficial_patch](https://en.wikipedia.org/wiki/Unofficial_patch).",
+ "monkey": "A patch which dynamically modifies runtime behavior. Refer to [https://en.wikipedia.org/wiki/Monkey_patch](https://en.wikipedia.org/wiki/Monkey_patch).",
+ "backport": "A patch which takes code from a newer version of the software and applies it to older versions of the same software. Refer to [https://en.wikipedia.org/wiki/Backporting](https://en.wikipedia.org/wiki/Backporting).",
+ "cherry-pick": "A patch created by selectively applying commits from other versions or branches of the same software."
+ },
+ "title": "Patch Type",
+ "description": "Specifies the purpose for the patch including the resolution of defects, security issues, or new behavior or functionality."
+ },
+ "diff": {
+ "title": "Diff",
+ "description": "The patch file (or diff) that shows changes. Refer to [https://en.wikipedia.org/wiki/Diff](https://en.wikipedia.org/wiki/Diff)",
+ "$ref": "#/definitions/diff"
+ },
+ "resolves": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/issue"},
+ "title": "Resolves",
+ "description": "A collection of issues the patch resolves"
+ }
+ }
+ },
+ "diff": {
+ "type": "object",
+ "title": "Diff",
+ "description": "The patch file (or diff) that shows changes. Refer to https://en.wikipedia.org/wiki/Diff",
+ "additionalProperties": false,
+ "properties": {
+ "text": {
+ "title": "Diff text",
+ "description": "Specifies the optional text of the diff",
+ "$ref": "#/definitions/attachment"
+ },
+ "url": {
+ "type": "string",
+ "title": "URL",
+ "description": "Specifies the URL to the diff",
+ "format": "iri-reference"
+ }
+ }
+ },
+ "issue": {
+ "type": "object",
+ "title": "Issue",
+ "description": "An individual issue that has been resolved.",
+ "required": [
+ "type"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "type": {
+ "type": "string",
+ "enum": [
+ "defect",
+ "enhancement",
+ "security"
+ ],
+ "meta:enum": {
+ "defect": "A fault, flaw, or bug in software.",
+ "enhancement": "A new feature or behavior in software.",
+ "security": "A special type of defect which impacts security."
+ },
+ "title": "Issue Type",
+ "description": "Specifies the type of issue"
+ },
+ "id": {
+ "type": "string",
+ "title": "Issue ID",
+ "description": "The identifier of the issue assigned by the source of the issue"
+ },
+ "name": {
+ "type": "string",
+ "title": "Issue Name",
+ "description": "The name of the issue"
+ },
+ "description": {
+ "type": "string",
+ "title": "Issue Description",
+ "description": "A description of the issue"
+ },
+ "source": {
+ "type": "object",
+ "title": "Source",
+ "description": "The source of the issue where it is documented",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "type": "string",
+ "title": "Name",
+ "description": "The name of the source.",
+ "examples": [
+ "National Vulnerability Database",
+ "NVD",
+ "Apache"
+ ]
+ },
+ "url": {
+ "type": "string",
+ "title": "URL",
+ "description": "The url of the issue documentation as provided by the source",
+ "format": "iri-reference"
+ }
+ }
+ },
+ "references": {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "format": "iri-reference"
+ },
+ "title": "References",
+ "description": "A collection of URL's for reference. Multiple URLs are allowed.",
+ "examples": ["https://example.com"]
+ }
+ }
+ },
+ "identifiableAction": {
+ "type": "object",
+ "title": "Identifiable Action",
+ "description": "Specifies an individual commit",
+ "additionalProperties": false,
+ "properties": {
+ "timestamp": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Timestamp",
+ "description": "The timestamp in which the action occurred"
+ },
+ "name": {
+ "type": "string",
+ "title": "Name",
+ "description": "The name of the individual who performed the action"
+ },
+ "email": {
+ "type": "string",
+ "format": "idn-email",
+ "title": "E-mail",
+ "description": "The email address of the individual who performed the action"
+ }
+ }
+ },
+ "externalReference": {
+ "type": "object",
+ "title": "External Reference",
+ "description": "External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM.",
+ "required": [
+ "url",
+ "type"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "url": {
+ "anyOf": [
+ {
+ "title": "URL",
+ "type": "string",
+ "format": "iri-reference"
+ },
+ {
+ "title": "BOM-Link",
+ "$ref": "#/definitions/bomLink"
+ }
+ ],
+ "title": "URL",
+ "description": "The URI (URL or URN) to the external reference. External references are URIs and therefore can accept any URL scheme including https ([RFC-7230](https://www.ietf.org/rfc/rfc7230.txt)), mailto ([RFC-2368](https://www.ietf.org/rfc/rfc2368.txt)), tel ([RFC-3966](https://www.ietf.org/rfc/rfc3966.txt)), and dns ([RFC-4501](https://www.ietf.org/rfc/rfc4501.txt)). External references may also include formally registered URNs such as [CycloneDX BOM-Link](https://cyclonedx.org/capabilities/bomlink/) to reference CycloneDX BOMs or any object within a BOM. BOM-Link transforms applicable external references into relationships that can be expressed in a BOM or across BOMs."
+ },
+ "comment": {
+ "type": "string",
+ "title": "Comment",
+ "description": "An optional comment describing the external reference"
+ },
+ "type": {
+ "type": "string",
+ "title": "Type",
+ "description": "Specifies the type of external reference.",
+ "enum": [
+ "vcs",
+ "issue-tracker",
+ "website",
+ "advisories",
+ "bom",
+ "mailing-list",
+ "social",
+ "chat",
+ "documentation",
+ "support",
+ "source-distribution",
+ "distribution",
+ "distribution-intake",
+ "license",
+ "build-meta",
+ "build-system",
+ "release-notes",
+ "security-contact",
+ "model-card",
+ "log",
+ "configuration",
+ "evidence",
+ "formulation",
+ "attestation",
+ "threat-model",
+ "adversary-model",
+ "risk-assessment",
+ "vulnerability-assertion",
+ "exploitability-statement",
+ "pentest-report",
+ "static-analysis-report",
+ "dynamic-analysis-report",
+ "runtime-analysis-report",
+ "component-analysis-report",
+ "maturity-report",
+ "certification-report",
+ "codified-infrastructure",
+ "quality-metrics",
+ "poam",
+ "electronic-signature",
+ "digital-signature",
+ "rfc-9116",
+ "other"
+ ],
+ "meta:enum": {
+ "vcs": "Version Control System",
+ "issue-tracker": "Issue or defect tracking system, or an Application Lifecycle Management (ALM) system",
+ "website": "Website",
+ "advisories": "Security advisories",
+ "bom": "Bill of Materials (SBOM, OBOM, HBOM, SaaSBOM, etc)",
+ "mailing-list": "Mailing list or discussion group",
+ "social": "Social media account",
+ "chat": "Real-time chat platform",
+ "documentation": "Documentation, guides, or how-to instructions",
+ "support": "Community or commercial support",
+ "source-distribution": "The location where the source code distributable can be obtained. This is often an archive format such as zip or tgz. The source-distribution type complements use of the version control (vcs) type.",
+ "distribution": "Direct or repository download location",
+ "distribution-intake": "The location where a component was published to. This is often the same as \"distribution\" but may also include specialized publishing processes that act as an intermediary.",
+ "license": "The reference to the license file. If a license URL has been defined in the license node, it should also be defined as an external reference for completeness.",
+ "build-meta": "Build-system specific meta file (i.e. pom.xml, package.json, .nuspec, etc)",
+ "build-system": "Reference to an automated build system",
+ "release-notes": "Reference to release notes",
+ "security-contact": "Specifies a way to contact the maintainer, supplier, or provider in the event of a security incident. Common URIs include links to a disclosure procedure, a mailto (RFC-2368) that specifies an email address, a tel (RFC-3966) that specifies a phone number, or dns (RFC-4501) that specifies the records containing DNS Security TXT.",
+ "model-card": "A model card describes the intended uses of a machine learning model, potential limitations, biases, ethical considerations, training parameters, datasets used to train the model, performance metrics, and other relevant data useful for ML transparency.",
+ "log": "A record of events that occurred in a computer system or application, such as problems, errors, or information on current operations.",
+ "configuration": "Parameters or settings that may be used by other components or services.",
+ "evidence": "Information used to substantiate a claim.",
+ "formulation": "Describes how a component or service was manufactured or deployed.",
+ "attestation": "Human or machine-readable statements containing facts, evidence, or testimony.",
+ "threat-model": "An enumeration of identified weaknesses, threats, and countermeasures, dataflow diagram (DFD), attack tree, and other supporting documentation in human-readable or machine-readable format.",
+ "adversary-model": "The defined assumptions, goals, and capabilities of an adversary.",
+ "risk-assessment": "Identifies and analyzes the potential of future events that may negatively impact individuals, assets, and/or the environment. Risk assessments may also include judgments on the tolerability of each risk.",
+ "vulnerability-assertion": "A Vulnerability Disclosure Report (VDR) which asserts the known and previously unknown vulnerabilities that affect a component, service, or product including the analysis and findings describing the impact (or lack of impact) that the reported vulnerability has on a component, service, or product.",
+ "exploitability-statement": "A Vulnerability Exploitability eXchange (VEX) which asserts the known vulnerabilities that do not affect a product, product family, or organization, and optionally the ones that do. The VEX should include the analysis and findings describing the impact (or lack of impact) that the reported vulnerability has on the product, product family, or organization.",
+ "pentest-report": "Results from an authorized simulated cyberattack on a component or service, otherwise known as a penetration test.",
+ "static-analysis-report": "SARIF or proprietary machine or human-readable report for which static analysis has identified code quality, security, and other potential issues with the source code.",
+ "dynamic-analysis-report": "Dynamic analysis report that has identified issues such as vulnerabilities and misconfigurations.",
+ "runtime-analysis-report": "Report generated by analyzing the call stack of a running application.",
+ "component-analysis-report": "Report generated by Software Composition Analysis (SCA), container analysis, or other forms of component analysis.",
+ "maturity-report": "Report containing a formal assessment of an organization, business unit, or team against a maturity model.",
+ "certification-report": "Industry, regulatory, or other certification from an accredited (if applicable) certification body.",
+ "codified-infrastructure": "Code or configuration that defines and provisions virtualized infrastructure, commonly referred to as Infrastructure as Code (IaC).",
+ "quality-metrics": "Report or system in which quality metrics can be obtained.",
+ "poam": "Plans of Action and Milestones (POA&M) complement an \"attestation\" external reference. POA&M is defined by NIST as a \"document that identifies tasks needing to be accomplished. It details resources required to accomplish the elements of the plan, any milestones in meeting the tasks and scheduled completion dates for the milestones\".",
+ "electronic-signature": "An e-signature is commonly a scanned representation of a written signature or a stylized script of the person's name.",
+ "digital-signature": "A signature that leverages cryptography, typically public/private key pairs, which provides strong authenticity verification.",
+ "rfc-9116": "Document that complies with [RFC 9116](https://www.ietf.org/rfc/rfc9116.html) (A File Format to Aid in Security Vulnerability Disclosure)",
+ "other": "Use this if no other types accurately describe the purpose of the external reference."
+ }
+ },
+ "hashes": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/hash"},
+ "title": "Hashes",
+ "description": "The hashes of the external reference (if applicable)."
+ }
+ }
+ },
+ "dependency": {
+ "type": "object",
+ "title": "Dependency",
+ "description": "Defines the direct dependencies of a component, service, or the components provided/implemented by a given component. Components or services that do not have their own dependencies must be declared as empty elements within the graph. Components or services that are not represented in the dependency graph may have unknown dependencies. It is recommended that implementations assume this to be opaque and not an indicator of an object being dependency-free. It is recommended to leverage compositions to indicate unknown dependency graphs.",
+ "required": [
+ "ref"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "ref": {
+ "$ref": "#/definitions/refLinkType",
+ "title": "Reference",
+ "description": "References a component or service by its bom-ref attribute"
+ },
+ "dependsOn": {
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/refLinkType"
+ },
+ "title": "Depends On",
+ "description": "The bom-ref identifiers of the components or services that are dependencies of this dependency object."
+ },
+ "provides": {
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/refLinkType"
+ },
+ "title": "Provides",
+ "description": "The bom-ref identifiers of the components or services that define a given specification or standard, which are provided or implemented by this dependency object.\nFor example, a cryptographic library which implements a cryptographic algorithm. A component which implements another component does not imply that the implementation is in use."
+ }
+ }
+ },
+ "service": {
+ "type": "object",
+ "title": "Service",
+ "required": [
+ "name"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the service elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ },
+ "provider": {
+ "title": "Provider",
+ "description": "The organization that provides the service.",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "group": {
+ "type": "string",
+ "title": "Service Group",
+ "description": "The grouping name, namespace, or identifier. This will often be a shortened, single name of the company or project that produced the service or domain name. Whitespace and special characters should be avoided.",
+ "examples": ["com.acme"]
+ },
+ "name": {
+ "type": "string",
+ "title": "Service Name",
+ "description": "The name of the service. This will often be a shortened, single name of the service.",
+ "examples": ["ticker-service"]
+ },
+ "version": {
+ "$ref": "#/definitions/version",
+ "title": "Service Version",
+ "description": "The service version."
+ },
+ "description": {
+ "type": "string",
+ "title": "Service Description",
+ "description": "Specifies a description for the service"
+ },
+ "endpoints": {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "format": "iri-reference"
+ },
+ "title": "Endpoints",
+ "description": "The endpoint URIs of the service. Multiple endpoints are allowed.",
+ "examples": ["https://example.com/api/v1/ticker"]
+ },
+ "authenticated": {
+ "type": "boolean",
+ "title": "Authentication Required",
+ "description": "A boolean value indicating if the service requires authentication. A value of true indicates the service requires authentication prior to use. A value of false indicates the service does not require authentication."
+ },
+ "x-trust-boundary": {
+ "type": "boolean",
+ "title": "Crosses Trust Boundary",
+ "description": "A boolean value indicating if use of the service crosses a trust zone or boundary. A value of true indicates that by using the service, a trust boundary is crossed. A value of false indicates that by using the service, a trust boundary is not crossed."
+ },
+ "trustZone": {
+ "type": "string",
+ "title": "Trust Zone",
+ "description": "The name of the trust zone the service resides in."
+ },
+ "data": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/serviceData"},
+ "title": "Data",
+ "description": "Specifies information about the data including the directional flow of data and the data classification."
+ },
+ "licenses": {
+ "$ref": "#/definitions/licenseChoice",
+ "title": "Service License(s)"
+ },
+ "externalReferences": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/externalReference"},
+ "title": "External References",
+ "description": "External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM."
+ },
+ "services": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/service"},
+ "uniqueItems": true,
+ "title": "Services",
+ "description": "A list of services included or deployed behind the parent service. This is not a dependency tree. It provides a way to specify a hierarchical representation of service assemblies."
+ },
+ "releaseNotes": {
+ "$ref": "#/definitions/releaseNotes",
+ "title": "Release notes",
+ "description": "Specifies optional release notes."
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {"$ref": "#/definitions/property"}
+ },
+ "tags": {
+ "$ref": "#/definitions/tags",
+ "title": "Tags"
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ }
+ }
+ },
+ "serviceData": {
+ "type": "object",
+ "title": "Hash Objects",
+ "required": [
+ "flow",
+ "classification"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "flow": {
+ "$ref": "#/definitions/dataFlowDirection",
+ "title": "Directional Flow",
+ "description": "Specifies the flow direction of the data. Direction is relative to the service. Inbound flow states that data enters the service. Outbound flow states that data leaves the service. Bi-directional states that data flows both ways and unknown states that the direction is not known."
+ },
+ "classification": {
+ "$ref": "#/definitions/dataClassification"
+ },
+ "name": {
+ "type": "string",
+ "title": "Name",
+ "description": "Name for the defined data",
+ "examples": [
+ "Credit card reporting"
+ ]
+ },
+ "description": {
+ "type": "string",
+ "title": "Description",
+ "description": "Short description of the data content and usage",
+ "examples": [
+ "Credit card information being exchanged in between the web app and the database"
+ ]
+ },
+ "governance": {
+ "title": "Data Governance",
+ "$ref": "#/definitions/dataGovernance"
+ },
+ "source": {
+ "type": "array",
+ "items": {
+ "anyOf": [
+ {
+ "title": "URL",
+ "type": "string",
+ "format": "iri-reference"
+ },
+ {
+ "title": "BOM-Link Element",
+ "$ref": "#/definitions/bomLinkElementType"
+ }
+ ]
+ },
+ "title": "Source",
+ "description": "The URI, URL, or BOM-Link of the components or services the data came in from"
+ },
+ "destination": {
+ "type": "array",
+ "items": {
+ "anyOf": [
+ {
+ "title": "URL",
+ "type": "string",
+ "format": "iri-reference"
+ },
+ {
+ "title": "BOM-Link Element",
+ "$ref": "#/definitions/bomLinkElementType"
+ }
+ ]
+ },
+ "title": "Destination",
+ "description": "The URI, URL, or BOM-Link of the components or services the data is sent to"
+ }
+ }
+ },
+ "dataFlowDirection": {
+ "type": "string",
+ "enum": [
+ "inbound",
+ "outbound",
+ "bi-directional",
+ "unknown"
+ ],
+ "meta:enum": {
+ "inbound": "Data that enters a service.",
+ "outbound": "Data that exits a service.",
+ "bi-directional": "Data flows in and out of the service.",
+ "unknown": "The directional flow of data is not known."
+ },
+ "title": "Data flow direction",
+ "description": "Specifies the flow direction of the data. Direction is relative to the service."
+ },
+ "copyright": {
+ "type": "object",
+ "title": "Copyright",
+ "description": "A copyright notice informing users of the underlying claims to copyright ownership in a published work.",
+ "required": [
+ "text"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "text": {
+ "type": "string",
+ "title": "Copyright Text",
+ "description": "The textual content of the copyright."
+ }
+ }
+ },
+ "componentEvidence": {
+ "type": "object",
+ "title": "Evidence",
+ "description": "Provides the ability to document evidence collected through various forms of extraction or analysis.",
+ "additionalProperties": false,
+ "properties": {
+ "identity": {
+ "title": "Identity Evidence",
+ "description": "Evidence that substantiates the identity of a component. The identity may be an object or an array of identity objects. Support for specifying identity as a single object was introduced in CycloneDX v1.5. Arrays were introduced in v1.6. It is recommended that all implementations use arrays, even if only one identity object is specified.",
+ "oneOf" : [
+ {
+ "type": "array",
+ "title": "Array of Identity Objects",
+ "items": { "$ref": "#/definitions/componentIdentityEvidence" }
+ },
+ {
+ "title": "A Single Identity Object",
+ "description": "[Deprecated]",
+ "$ref": "#/definitions/componentIdentityEvidence",
+ "deprecated": true
+ }
+ ]
+ },
+ "occurrences": {
+ "type": "array",
+ "title": "Occurrences",
+ "description": "Evidence of individual instances of a component spread across multiple locations.",
+ "items": {
+ "type": "object",
+ "required": [ "location" ],
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the occurrence elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ },
+ "location": {
+ "type": "string",
+ "title": "Location",
+ "description": "The location or path to where the component was found."
+ },
+ "line": {
+ "type": "integer",
+ "minimum": 0,
+ "title": "Line Number",
+ "description": "The line number where the component was found."
+ },
+ "offset": {
+ "type": "integer",
+ "minimum": 0,
+ "title": "Offset",
+ "description": "The offset where the component was found."
+ },
+ "symbol": {
+ "type": "string",
+ "title": "Symbol",
+ "description": "The symbol name that was found associated with the component."
+ },
+ "additionalContext": {
+ "type": "string",
+ "title": "Additional Context",
+ "description": "Any additional context of the detected component (e.g. a code snippet)."
+ }
+ }
+ }
+ },
+ "callstack": {
+ "type": "object",
+ "title": "Call Stack",
+ "description": "Evidence of the components use through the callstack.",
+ "additionalProperties": false,
+ "properties": {
+ "frames": {
+ "type": "array",
+ "title": "Frames",
+ "description": "Within a call stack, a frame is a discrete unit that encapsulates an execution context, including local variables, parameters, and the return address. As function calls are made, frames are pushed onto the stack, forming an array-like structure that orchestrates the flow of program execution and manages the sequence of function invocations.",
+ "items": {
+ "type": "object",
+ "required": [
+ "module"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "package": {
+ "title": "Package",
+ "description": "A package organizes modules into namespaces, providing a unique namespace for each type it contains.",
+ "type": "string"
+ },
+ "module": {
+ "title": "Module",
+ "description": "A module or class that encloses functions/methods and other code.",
+ "type": "string"
+ },
+ "function": {
+ "title": "Function",
+ "description": "A block of code designed to perform a particular task.",
+ "type": "string"
+ },
+ "parameters": {
+ "title": "Parameters",
+ "description": "Optional arguments that are passed to the module or function.",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "line": {
+ "title": "Line",
+ "description": "The line number the code that is called resides on.",
+ "type": "integer"
+ },
+ "column": {
+ "title": "Column",
+ "description": "The column the code that is called resides.",
+ "type": "integer"
+ },
+ "fullFilename": {
+ "title": "Full Filename",
+ "description": "The full path and filename of the module.",
+ "type": "string"
+ }
+ }
+ }
+ }
+ }
+ },
+ "licenses": {
+ "$ref": "#/definitions/licenseChoice",
+ "title": "License Evidence"
+ },
+ "copyright": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/copyright"},
+ "title": "Copyright Evidence",
+ "description": "Copyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection."
+ }
+ }
+ },
+ "compositions": {
+ "type": "object",
+ "title": "Compositions",
+ "required": [
+ "aggregate"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the composition elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ },
+ "aggregate": {
+ "$ref": "#/definitions/aggregateType",
+ "title": "Aggregate",
+ "description": "Specifies an aggregate type that describe how complete a relationship is."
+ },
+ "assemblies": {
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "anyOf": [
+ {
+ "title": "Ref",
+ "$ref": "#/definitions/refLinkType"
+ },
+ {
+ "title": "BOM-Link Element",
+ "$ref": "#/definitions/bomLinkElementType"
+ }
+ ]
+ },
+ "title": "BOM references",
+ "description": "The bom-ref identifiers of the components or services being described. Assemblies refer to nested relationships whereby a constituent part may include other constituent parts. References do not cascade to child parts. References are explicit for the specified constituent part only."
+ },
+ "dependencies": {
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "type": "string"
+ },
+ "title": "BOM references",
+ "description": "The bom-ref identifiers of the components or services being described. Dependencies refer to a relationship whereby an independent constituent part requires another independent constituent part. References do not cascade to transitive dependencies. References are explicit for the specified dependency only."
+ },
+ "vulnerabilities": {
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "type": "string"
+ },
+ "title": "BOM references",
+ "description": "The bom-ref identifiers of the vulnerabilities being described."
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ }
+ }
+ },
+ "aggregateType": {
+ "type": "string",
+ "default": "not_specified",
+ "enum": [
+ "complete",
+ "incomplete",
+ "incomplete_first_party_only",
+ "incomplete_first_party_proprietary_only",
+ "incomplete_first_party_opensource_only",
+ "incomplete_third_party_only",
+ "incomplete_third_party_proprietary_only",
+ "incomplete_third_party_opensource_only",
+ "unknown",
+ "not_specified"
+ ],
+ "meta:enum": {
+ "complete": "The relationship is complete. No further relationships including constituent components, services, or dependencies are known to exist.",
+ "incomplete": "The relationship is incomplete. Additional relationships exist and may include constituent components, services, or dependencies.",
+ "incomplete_first_party_only": "The relationship is incomplete. Only relationships for first-party components, services, or their dependencies are represented.",
+ "incomplete_first_party_proprietary_only": "The relationship is incomplete. Only relationships for first-party components, services, or their dependencies are represented, limited specifically to those that are proprietary.",
+ "incomplete_first_party_opensource_only": "The relationship is incomplete. Only relationships for first-party components, services, or their dependencies are represented, limited specifically to those that are opensource.",
+ "incomplete_third_party_only": "The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented.",
+ "incomplete_third_party_proprietary_only": "The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are proprietary.",
+ "incomplete_third_party_opensource_only": "The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are opensource.",
+ "unknown": "The relationship may be complete or incomplete. This usually signifies a 'best-effort' to obtain constituent components, services, or dependencies but the completeness is inconclusive.",
+ "not_specified": "The relationship completeness is not specified."
+ }
+ },
+ "property": {
+ "type": "object",
+ "title": "Lightweight name-value pair",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "required": [
+ "name"
+ ],
+ "properties": {
+ "name": {
+ "type": "string",
+ "title": "Name",
+ "description": "The name of the property. Duplicate names are allowed, each potentially having a different value."
+ },
+ "value": {
+ "type": "string",
+ "title": "Value",
+ "description": "The value of the property."
+ }
+ },
+ "additionalProperties": false
+ },
+ "localeType": {
+ "type": "string",
+ "pattern": "^([a-z]{2})(-[A-Z]{2})?$",
+ "title": "Locale",
+ "description": "Defines a syntax for representing two character language code (ISO-639) followed by an optional two character country code. The language code must be lower case. If the country code is specified, the country code must be upper case. The language code and country code must be separated by a minus sign. Examples: en, en-US, fr, fr-CA"
+ },
+ "releaseType": {
+ "type": "string",
+ "examples": [
+ "major",
+ "minor",
+ "patch",
+ "pre-release",
+ "internal"
+ ],
+ "description": "The software versioning type. It is recommended that the release type use one of 'major', 'minor', 'patch', 'pre-release', or 'internal'. Representing all possible software release types is not practical, so standardizing on the recommended values, whenever possible, is strongly encouraged.\n\n* __major__ = A major release may contain significant changes or may introduce breaking changes.\n* __minor__ = A minor release, also known as an update, may contain a smaller number of changes than major releases.\n* __patch__ = Patch releases are typically unplanned and may resolve defects or important security issues.\n* __pre-release__ = A pre-release may include alpha, beta, or release candidates and typically have limited support. They provide the ability to preview a release prior to its general availability.\n* __internal__ = Internal releases are not for public consumption and are intended to be used exclusively by the project or manufacturer that produced it."
+ },
+ "note": {
+ "type": "object",
+ "title": "Note",
+ "description": "A note containing the locale and content.",
+ "required": [
+ "text"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "locale": {
+ "$ref": "#/definitions/localeType",
+ "title": "Locale",
+ "description": "The ISO-639 (or higher) language code and optional ISO-3166 (or higher) country code. Examples include: \"en\", \"en-US\", \"fr\" and \"fr-CA\""
+ },
+ "text": {
+ "title": "Release note content",
+ "description": "Specifies the full content of the release note.",
+ "$ref": "#/definitions/attachment"
+ }
+ }
+ },
+ "releaseNotes": {
+ "type": "object",
+ "title": "Release notes",
+ "required": [
+ "type"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "type": {
+ "$ref": "#/definitions/releaseType",
+ "title": "Type",
+ "description": "The software versioning type the release note describes."
+ },
+ "title": {
+ "type": "string",
+ "title": "Title",
+ "description": "The title of the release."
+ },
+ "featuredImage": {
+ "type": "string",
+ "format": "iri-reference",
+ "title": "Featured image",
+ "description": "The URL to an image that may be prominently displayed with the release note."
+ },
+ "socialImage": {
+ "type": "string",
+ "format": "iri-reference",
+ "title": "Social image",
+ "description": "The URL to an image that may be used in messaging on social media platforms."
+ },
+ "description": {
+ "type": "string",
+ "title": "Description",
+ "description": "A short description of the release."
+ },
+ "timestamp": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Timestamp",
+ "description": "The date and time (timestamp) when the release note was created."
+ },
+ "aliases": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "title": "Aliases",
+ "description": "One or more alternate names the release may be referred to. This may include unofficial terms used by development and marketing teams (e.g. code names)."
+ },
+ "tags": {
+ "$ref": "#/definitions/tags",
+ "title": "Tags"
+ },
+ "resolves": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/issue"},
+ "title": "Resolves",
+ "description": "A collection of issues that have been resolved."
+ },
+ "notes": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/note"},
+ "title": "Notes",
+ "description": "Zero or more release notes containing the locale and content. Multiple note objects may be specified to support release notes in a wide variety of languages."
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {"$ref": "#/definitions/property"}
+ }
+ }
+ },
+ "advisory": {
+ "type": "object",
+ "title": "Advisory",
+ "description": "Title and location where advisory information can be obtained. An advisory is a notification of a threat to a component, service, or system.",
+ "required": ["url"],
+ "additionalProperties": false,
+ "properties": {
+ "title": {
+ "type": "string",
+ "title": "Title",
+ "description": "An optional name of the advisory."
+ },
+ "url": {
+ "type": "string",
+ "title": "URL",
+ "format": "iri-reference",
+ "description": "Location where the advisory can be obtained."
+ }
+ }
+ },
+ "cwe": {
+ "type": "integer",
+ "minimum": 1,
+ "title": "CWE",
+ "description": "Integer representation of a Common Weaknesses Enumerations (CWE). For example 399 (of https://cwe.mitre.org/data/definitions/399.html)"
+ },
+ "severity": {
+ "type": "string",
+ "title": "Severity",
+ "description": "Textual representation of the severity of the vulnerability adopted by the analysis method. If the analysis method uses values other than what is provided, the user is expected to translate appropriately.",
+ "enum": [
+ "critical",
+ "high",
+ "medium",
+ "low",
+ "info",
+ "none",
+ "unknown"
+ ],
+ "meta:enum": {
+ "critical": "Critical severity",
+ "high": "High severity",
+ "medium": "Medium severity",
+ "low": "Low severity",
+ "info": "Informational warning.",
+ "none": "None",
+ "unknown": "The severity is not known"
+ }
+ },
+ "scoreMethod": {
+ "type": "string",
+ "title": "Method",
+ "description": "Specifies the severity or risk scoring methodology or standard used.",
+ "enum": [
+ "CVSSv2",
+ "CVSSv3",
+ "CVSSv31",
+ "CVSSv4",
+ "OWASP",
+ "SSVC",
+ "other"
+ ],
+ "meta:enum": {
+ "CVSSv2": "Common Vulnerability Scoring System v2.0",
+ "CVSSv3": "Common Vulnerability Scoring System v3.0",
+ "CVSSv31": "Common Vulnerability Scoring System v3.1",
+ "CVSSv4": "Common Vulnerability Scoring System v4.0",
+ "OWASP": "OWASP Risk Rating Methodology",
+ "SSVC": "Stakeholder Specific Vulnerability Categorization",
+ "other": "Another severity or risk scoring methodology"
+ }
+ },
+ "impactAnalysisState": {
+ "type": "string",
+ "title": "Impact Analysis State",
+ "description": "Declares the current state of an occurrence of a vulnerability, after automated or manual analysis.",
+ "enum": [
+ "resolved",
+ "resolved_with_pedigree",
+ "exploitable",
+ "in_triage",
+ "false_positive",
+ "not_affected"
+ ],
+ "meta:enum": {
+ "resolved": "The vulnerability has been remediated.",
+ "resolved_with_pedigree": "The vulnerability has been remediated and evidence of the changes are provided in the affected components pedigree containing verifiable commit history and/or diff(s).",
+ "exploitable": "The vulnerability may be directly or indirectly exploitable.",
+ "in_triage": "The vulnerability is being investigated.",
+ "false_positive": "The vulnerability is not specific to the component or service and was falsely identified or associated.",
+ "not_affected": "The component or service is not affected by the vulnerability. Justification should be specified for all not_affected cases."
+ }
+ },
+ "impactAnalysisJustification": {
+ "type": "string",
+ "title": "Impact Analysis Justification",
+ "description": "The rationale of why the impact analysis state was asserted.",
+ "enum": [
+ "code_not_present",
+ "code_not_reachable",
+ "requires_configuration",
+ "requires_dependency",
+ "requires_environment",
+ "protected_by_compiler",
+ "protected_at_runtime",
+ "protected_at_perimeter",
+ "protected_by_mitigating_control"
+ ],
+ "meta:enum": {
+ "code_not_present": "The code has been removed or tree-shaked.",
+ "code_not_reachable": "The vulnerable code is not invoked at runtime.",
+ "requires_configuration": "Exploitability requires a configurable option to be set/unset.",
+ "requires_dependency": "Exploitability requires a dependency that is not present.",
+ "requires_environment": "Exploitability requires a certain environment which is not present.",
+ "protected_by_compiler": "Exploitability requires a compiler flag to be set/unset.",
+ "protected_at_runtime": "Exploits are prevented at runtime.",
+ "protected_at_perimeter": "Attacks are blocked at physical, logical, or network perimeter.",
+ "protected_by_mitigating_control": "Preventative measures have been implemented that reduce the likelihood and/or impact of the vulnerability."
+ }
+ },
+ "rating": {
+ "type": "object",
+ "title": "Rating",
+ "description": "Defines the severity or risk ratings of a vulnerability.",
+ "additionalProperties": false,
+ "properties": {
+ "source": {
+ "$ref": "#/definitions/vulnerabilitySource",
+ "description": "The source that calculated the severity or risk rating of the vulnerability."
+ },
+ "score": {
+ "type": "number",
+ "title": "Score",
+ "description": "The numerical score of the rating."
+ },
+ "severity": {
+ "$ref": "#/definitions/severity",
+ "description": "Textual representation of the severity that corresponds to the numerical score of the rating."
+ },
+ "method": {
+ "$ref": "#/definitions/scoreMethod"
+ },
+ "vector": {
+ "type": "string",
+ "title": "Vector",
+ "description": "Textual representation of the metric values used to score the vulnerability"
+ },
+ "justification": {
+ "type": "string",
+ "title": "Justification",
+ "description": "An optional reason for rating the vulnerability as it was"
+ }
+ }
+ },
+ "vulnerabilitySource": {
+ "type": "object",
+ "title": "Source",
+ "description": "The source of vulnerability information. This is often the organization that published the vulnerability.",
+ "additionalProperties": false,
+ "properties": {
+ "url": {
+ "type": "string",
+ "title": "URL",
+ "description": "The url of the vulnerability documentation as provided by the source.",
+ "examples": [
+ "https://nvd.nist.gov/vuln/detail/CVE-2021-39182"
+ ]
+ },
+ "name": {
+ "type": "string",
+ "title": "Name",
+ "description": "The name of the source.",
+ "examples": [
+ "NVD",
+ "National Vulnerability Database",
+ "OSS Index",
+ "VulnDB",
+ "GitHub Advisories"
+ ]
+ }
+ }
+ },
+ "vulnerability": {
+ "type": "object",
+ "title": "Vulnerability",
+ "description": "Defines a weakness in a component or service that could be exploited or triggered by a threat source.",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the vulnerability elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ },
+ "id": {
+ "type": "string",
+ "title": "ID",
+ "description": "The identifier that uniquely identifies the vulnerability.",
+ "examples": [
+ "CVE-2021-39182",
+ "GHSA-35m5-8cvj-8783",
+ "SNYK-PYTHON-ENROCRYPT-1912876"
+ ]
+ },
+ "source": {
+ "$ref": "#/definitions/vulnerabilitySource",
+ "description": "The source that published the vulnerability."
+ },
+ "references": {
+ "type": "array",
+ "title": "References",
+ "description": "Zero or more pointers to vulnerabilities that are the equivalent of the vulnerability specified. Often times, the same vulnerability may exist in multiple sources of vulnerability intelligence, but have different identifiers. References provide a way to correlate vulnerabilities across multiple sources of vulnerability intelligence.",
+ "items": {
+ "type": "object",
+ "required": [
+ "id",
+ "source"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "id": {
+ "type": "string",
+ "title": "ID",
+ "description": "An identifier that uniquely identifies the vulnerability.",
+ "examples": [
+ "CVE-2021-39182",
+ "GHSA-35m5-8cvj-8783",
+ "SNYK-PYTHON-ENROCRYPT-1912876"
+ ]
+ },
+ "source": {
+ "$ref": "#/definitions/vulnerabilitySource",
+ "description": "The source that published the vulnerability."
+ }
+ }
+ }
+ },
+ "ratings": {
+ "type": "array",
+ "title": "Ratings",
+ "description": "List of vulnerability ratings",
+ "items": {
+ "$ref": "#/definitions/rating"
+ }
+ },
+ "cwes": {
+ "type": "array",
+ "title": "CWEs",
+ "description": "List of Common Weaknesses Enumerations (CWEs) codes that describes this vulnerability.",
+ "examples": [399],
+ "items": {
+ "$ref": "#/definitions/cwe"
+ }
+ },
+ "description": {
+ "type": "string",
+ "title": "Description",
+ "description": "A description of the vulnerability as provided by the source."
+ },
+ "detail": {
+ "type": "string",
+ "title": "Details",
+ "description": "If available, an in-depth description of the vulnerability as provided by the source organization. Details often include information useful in understanding root cause."
+ },
+ "recommendation": {
+ "type": "string",
+ "title": "Recommendation",
+ "description": "Recommendations of how the vulnerability can be remediated or mitigated."
+ },
+ "workaround": {
+ "type": "string",
+ "title": "Workarounds",
+ "description": "A bypass, usually temporary, of the vulnerability that reduces its likelihood and/or impact. Workarounds often involve changes to configuration or deployments."
+ },
+ "proofOfConcept": {
+ "type": "object",
+ "title": "Proof of Concept",
+ "description": "Evidence used to reproduce the vulnerability.",
+ "properties": {
+ "reproductionSteps": {
+ "type": "string",
+ "title": "Steps to Reproduce",
+ "description": "Precise steps to reproduce the vulnerability."
+ },
+ "environment": {
+ "type": "string",
+ "title": "Environment",
+ "description": "A description of the environment in which reproduction was possible."
+ },
+ "supportingMaterial": {
+ "type": "array",
+ "title": "Supporting Material",
+ "description": "Supporting material that helps in reproducing or understanding how reproduction is possible. This may include screenshots, payloads, and PoC exploit code.",
+ "items": { "$ref": "#/definitions/attachment" }
+ }
+ }
+ },
+ "advisories": {
+ "type": "array",
+ "title": "Advisories",
+ "description": "Published advisories of the vulnerability if provided.",
+ "items": {
+ "$ref": "#/definitions/advisory"
+ }
+ },
+ "created": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Created",
+ "description": "The date and time (timestamp) when the vulnerability record was created in the vulnerability database."
+ },
+ "published": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Published",
+ "description": "The date and time (timestamp) when the vulnerability record was first published."
+ },
+ "updated": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Updated",
+ "description": "The date and time (timestamp) when the vulnerability record was last updated."
+ },
+ "rejected": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Rejected",
+ "description": "The date and time (timestamp) when the vulnerability record was rejected (if applicable)."
+ },
+ "credits": {
+ "type": "object",
+ "title": "Credits",
+ "description": "Individuals or organizations credited with the discovery of the vulnerability.",
+ "additionalProperties": false,
+ "properties": {
+ "organizations": {
+ "type": "array",
+ "title": "Organizations",
+ "description": "The organizations credited with vulnerability discovery.",
+ "items": {
+ "$ref": "#/definitions/organizationalEntity"
+ }
+ },
+ "individuals": {
+ "type": "array",
+ "title": "Individuals",
+ "description": "The individuals, not associated with organizations, that are credited with vulnerability discovery.",
+ "items": {
+ "$ref": "#/definitions/organizationalContact"
+ }
+ }
+ }
+ },
+ "tools": {
+ "title": "Tools",
+ "description": "The tool(s) used to identify, confirm, or score the vulnerability.",
+ "oneOf": [
+ {
+ "type": "object",
+ "title": "Tools",
+ "description": "The tool(s) used to identify, confirm, or score the vulnerability.",
+ "additionalProperties": false,
+ "properties": {
+ "components": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/component"},
+ "uniqueItems": true,
+ "title": "Components",
+ "description": "A list of software and hardware components used as tools."
+ },
+ "services": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/service"},
+ "uniqueItems": true,
+ "title": "Services",
+ "description": "A list of services used as tools. This may include microservices, function-as-a-service, and other types of network or intra-process services."
+ }
+ }
+ },
+ {
+ "type": "array",
+ "title": "Tools (legacy)",
+ "description": "[Deprecated] The tool(s) used to identify, confirm, or score the vulnerability.",
+ "items": {"$ref": "#/definitions/tool"}
+ }
+ ]
+ },
+ "analysis": {
+ "type": "object",
+ "title": "Impact Analysis",
+ "description": "An assessment of the impact and exploitability of the vulnerability.",
+ "additionalProperties": false,
+ "properties": {
+ "state": {
+ "$ref": "#/definitions/impactAnalysisState"
+ },
+ "justification": {
+ "$ref": "#/definitions/impactAnalysisJustification"
+ },
+ "response": {
+ "type": "array",
+ "title": "Response",
+ "description": "A response to the vulnerability by the manufacturer, supplier, or project responsible for the affected component or service. More than one response is allowed. Responses are strongly encouraged for vulnerabilities where the analysis state is exploitable.",
+ "items": {
+ "type": "string",
+ "enum": [
+ "can_not_fix",
+ "will_not_fix",
+ "update",
+ "rollback",
+ "workaround_available"
+ ],
+ "meta:enum": {
+ "can_not_fix": "Can not fix",
+ "will_not_fix": "Will not fix",
+ "update": "Update to a different revision or release",
+ "rollback": "Revert to a previous revision or release",
+ "workaround_available": "There is a workaround available"
+ }
+ }
+ },
+ "detail": {
+ "type": "string",
+ "title": "Detail",
+ "description": "Detailed description of the impact including methods used during assessment. If a vulnerability is not exploitable, this field should include specific details on why the component or service is not impacted by this vulnerability."
+ },
+ "firstIssued": {
+ "type": "string",
+ "format": "date-time",
+ "title": "First Issued",
+ "description": "The date and time (timestamp) when the analysis was first issued."
+ },
+ "lastUpdated": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Last Updated",
+ "description": "The date and time (timestamp) when the analysis was last updated."
+ }
+ }
+ },
+ "affects": {
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "type": "object",
+ "required": [
+ "ref"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "ref": {
+ "anyOf": [
+ {
+ "title": "Ref",
+ "$ref": "#/definitions/refLinkType"
+ },
+ {
+ "title": "BOM-Link Element",
+ "$ref": "#/definitions/bomLinkElementType"
+ }
+ ],
+ "title": "Reference",
+ "description": "References a component or service by the objects bom-ref"
+ },
+ "versions": {
+ "type": "array",
+ "title": "Versions",
+ "description": "Zero or more individual versions or range of versions.",
+ "items": {
+ "type": "object",
+ "oneOf": [
+ {
+ "required": ["version"]
+ },
+ {
+ "required": ["range"]
+ }
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "version": {
+ "title": "Version",
+ "description": "A single version of a component or service.",
+ "$ref": "#/definitions/version"
+ },
+ "range": {
+ "title": "Version Range",
+ "description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst",
+ "$ref": "#/definitions/versionRange"
+ },
+ "status": {
+ "title": "Status",
+ "description": "The vulnerability status for the version or range of versions.",
+ "$ref": "#/definitions/affectedStatus",
+ "default": "affected"
+ }
+ }
+ }
+ }
+ }
+ },
+ "title": "Affects",
+ "description": "The components or services that are affected by the vulnerability."
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "affectedStatus": {
+ "description": "The vulnerability status of a given version or range of versions of a product. The statuses 'affected' and 'unaffected' indicate that the version is affected or unaffected by the vulnerability. The status 'unknown' indicates that it is unknown or unspecified whether the given version is affected. There can be many reasons for an 'unknown' status, including that an investigation has not been undertaken or that a vendor has not disclosed the status.",
+ "type": "string",
+ "enum": [
+ "affected",
+ "unaffected",
+ "unknown"
+ ],
+ "meta:enum": {
+ "affected": "The version is affected by the vulnerability.",
+ "unaffected": "The version is not affected by the vulnerability.",
+ "unknown": "It is unknown (or unspecified) whether the given version is affected."
+ }
+ },
+ "version": {
+ "description": "A single disjunctive version identifier, for a component or service.",
+ "type": "string",
+ "maxLength": 1024,
+ "examples": [
+ "9.0.14",
+ "v1.33.7",
+ "7.0.0-M1",
+ "2.0pre1",
+ "1.0.0-beta1",
+ "0.8.15"
+ ]
+ },
+ "versionRange": {
+ "description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst",
+ "type": "string",
+ "minLength": 1,
+ "maxLength": 4096,
+ "examples": [
+ "vers:cargo/9.0.14",
+ "vers:npm/1.2.3|>=2.0.0|<5.0.0",
+ "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1",
+ "vers:tomee/>=1.0.0-beta1|<=1.7.5|>=7.0.0-M1|<=7.0.7|>=7.1.0|<=7.1.2|>=8.0.0-M1|<=8.0.1",
+ "vers:gem/>=2.2.0|!= 2.2.1|<2.3.0"
+ ]
+ },
+ "range": {
+ "deprecated": true,
+ "description": "Deprecated definition. use definition `versionRange` instead.",
+ "$ref": "#/definitions/versionRange"
+ },
+ "annotations": {
+ "type": "object",
+ "title": "Annotations",
+ "description": "A comment, note, explanation, or similar textual content which provides additional context to the object(s) being annotated.",
+ "required": [
+ "subjects",
+ "annotator",
+ "timestamp",
+ "text"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the annotation elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ },
+ "subjects": {
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "anyOf": [
+ {
+ "title": "Ref",
+ "$ref": "#/definitions/refLinkType"
+ },
+ {
+ "title": "BOM-Link Element",
+ "$ref": "#/definitions/bomLinkElementType"
+ }
+ ]
+ },
+ "title": "Subjects",
+ "description": "The object in the BOM identified by its bom-ref. This is often a component or service, but may be any object type supporting bom-refs."
+ },
+ "annotator": {
+ "type": "object",
+ "title": "Annotator",
+ "description": "The organization, person, component, or service which created the textual content of the annotation.",
+ "oneOf": [
+ {
+ "required": [
+ "organization"
+ ]
+ },
+ {
+ "required": [
+ "individual"
+ ]
+ },
+ {
+ "required": [
+ "component"
+ ]
+ },
+ {
+ "required": [
+ "service"
+ ]
+ }
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "organization": {
+ "description": "The organization that created the annotation",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "individual": {
+ "description": "The person that created the annotation",
+ "$ref": "#/definitions/organizationalContact"
+ },
+ "component": {
+ "description": "The tool or component that created the annotation",
+ "$ref": "#/definitions/component"
+ },
+ "service": {
+ "description": "The service that created the annotation",
+ "$ref": "#/definitions/service"
+ }
+ }
+ },
+ "timestamp": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Timestamp",
+ "description": "The date and time (timestamp) when the annotation was created."
+ },
+ "text": {
+ "type": "string",
+ "title": "Text",
+ "description": "The textual content of the annotation."
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ }
+ }
+ },
+ "modelCard": {
+ "$comment": "Model card support in CycloneDX is derived from TensorFlow Model Card Toolkit released under the Apache 2.0 license and available from https://github.com/tensorflow/model-card-toolkit/blob/main/model_card_toolkit/schema/v0.0.2/model_card.schema.json. In addition, CycloneDX model card support includes portions of VerifyML, also released under the Apache 2.0 license and available from https://github.com/cylynx/verifyml/blob/main/verifyml/model_card_toolkit/schema/v0.0.4/model_card.schema.json.",
+ "type": "object",
+ "title": "Model Card",
+ "description": "A model card describes the intended uses of a machine learning model and potential limitations, including biases and ethical considerations. Model cards typically contain the training parameters, which datasets were used to train the model, performance metrics, and other relevant data useful for ML transparency. This object SHOULD be specified for any component of type `machine-learning-model` and must not be specified for other component types.",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the model card elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ },
+ "modelParameters": {
+ "type": "object",
+ "title": "Model Parameters",
+ "description": "Hyper-parameters for construction of the model.",
+ "additionalProperties": false,
+ "properties": {
+ "approach": {
+ "type": "object",
+ "title": "Approach",
+ "description": "The overall approach to learning used by the model for problem solving.",
+ "additionalProperties": false,
+ "properties": {
+ "type": {
+ "type": "string",
+ "title": "Learning Type",
+ "description": "Learning types describing the learning problem or hybrid learning problem.",
+ "enum": [
+ "supervised",
+ "unsupervised",
+ "reinforcement-learning",
+ "semi-supervised",
+ "self-supervised"
+ ],
+ "meta:enum": {
+ "supervised": "Supervised machine learning involves training an algorithm on labeled data to predict or classify new data based on the patterns learned from the labeled examples.",
+ "unsupervised": "Unsupervised machine learning involves training algorithms on unlabeled data to discover patterns, structures, or relationships without explicit guidance, allowing the model to identify inherent structures or clusters within the data.",
+ "reinforcement-learning": "Reinforcement learning is a type of machine learning where an agent learns to make decisions by interacting with an environment to maximize cumulative rewards, through trial and error.",
+ "semi-supervised": "Semi-supervised machine learning utilizes a combination of labeled and unlabeled data during training to improve model performance, leveraging the benefits of both supervised and unsupervised learning techniques.",
+ "self-supervised": "Self-supervised machine learning involves training models to predict parts of the input data from other parts of the same data, without requiring external labels, enabling learning from large amounts of unlabeled data."
+ }
+ }
+ }
+ },
+ "task": {
+ "type": "string",
+ "title": "Task",
+ "description": "Directly influences the input and/or output. Examples include classification, regression, clustering, etc."
+ },
+ "architectureFamily": {
+ "type": "string",
+ "title": "Architecture Family",
+ "description": "The model architecture family such as transformer network, convolutional neural network, residual neural network, LSTM neural network, etc."
+ },
+ "modelArchitecture": {
+ "type": "string",
+ "title": "Model Architecture",
+ "description": "The specific architecture of the model such as GPT-1, ResNet-50, YOLOv3, etc."
+ },
+ "datasets": {
+ "type": "array",
+ "title": "Datasets",
+ "description": "The datasets used to train and evaluate the model.",
+ "items" : {
+ "oneOf" : [
+ {
+ "title": "Inline Data Information",
+ "$ref": "#/definitions/componentData"
+ },
+ {
+ "type": "object",
+ "title": "Data Reference",
+ "additionalProperties": false,
+ "properties": {
+ "ref": {
+ "anyOf": [
+ {
+ "title": "Ref",
+ "$ref": "#/definitions/refLinkType"
+ },
+ {
+ "title": "BOM-Link Element",
+ "$ref": "#/definitions/bomLinkElementType"
+ }
+ ],
+ "title": "Reference",
+ "type": "string",
+ "description": "References a data component by the components bom-ref attribute"
+ }
+ }
+ }
+ ]
+ }
+ },
+ "inputs": {
+ "type": "array",
+ "title": "Inputs",
+ "description": "The input format(s) of the model",
+ "items": { "$ref": "#/definitions/inputOutputMLParameters" }
+ },
+ "outputs": {
+ "type": "array",
+ "title": "Outputs",
+ "description": "The output format(s) from the model",
+ "items": { "$ref": "#/definitions/inputOutputMLParameters" }
+ }
+ }
+ },
+ "quantitativeAnalysis": {
+ "type": "object",
+ "title": "Quantitative Analysis",
+ "description": "A quantitative analysis of the model",
+ "additionalProperties": false,
+ "properties": {
+ "performanceMetrics": {
+ "type": "array",
+ "title": "Performance Metrics",
+ "description": "The model performance metrics being reported. Examples may include accuracy, F1 score, precision, top-3 error rates, MSC, etc.",
+ "items": { "$ref": "#/definitions/performanceMetric" }
+ },
+ "graphics": { "$ref": "#/definitions/graphicsCollection" }
+ }
+ },
+ "considerations": {
+ "type": "object",
+ "title": "Considerations",
+ "description": "What considerations should be taken into account regarding the model's construction, training, and application?",
+ "additionalProperties": false,
+ "properties": {
+ "users": {
+ "type": "array",
+ "title": "Users",
+ "description": "Who are the intended users of the model?",
+ "items": {
+ "type": "string"
+ }
+ },
+ "useCases": {
+ "type": "array",
+ "title": "Use Cases",
+ "description": "What are the intended use cases of the model?",
+ "items": {
+ "type": "string"
+ }
+ },
+ "technicalLimitations": {
+ "type": "array",
+ "title": "Technical Limitations",
+ "description": "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?",
+ "items": {
+ "type": "string"
+ }
+ },
+ "performanceTradeoffs": {
+ "type": "array",
+ "title": "Performance Tradeoffs",
+ "description": "What are the known tradeoffs in accuracy/performance of the model?",
+ "items": {
+ "type": "string"
+ }
+ },
+ "ethicalConsiderations": {
+ "type": "array",
+ "title": "Ethical Considerations",
+ "description": "What are the ethical risks involved in the application of this model?",
+ "items": { "$ref": "#/definitions/risk" }
+ },
+ "environmentalConsiderations":{
+ "$ref": "#/definitions/environmentalConsiderations",
+ "title": "Environmental Considerations",
+ "description": "What are the various environmental impacts the corresponding machine learning model has exhibited across its lifecycle?"
+ },
+ "fairnessAssessments": {
+ "type": "array",
+ "title": "Fairness Assessments",
+ "description": "How does the model affect groups at risk of being systematically disadvantaged? What are the harms and benefits to the various affected groups?",
+ "items": {
+ "$ref": "#/definitions/fairnessAssessment"
+ }
+ }
+ }
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {"$ref": "#/definitions/property"}
+ }
+ }
+ },
+ "inputOutputMLParameters": {
+ "type": "object",
+ "title": "Input and Output Parameters",
+ "additionalProperties": false,
+ "properties": {
+ "format": {
+ "title": "Input/Output Format",
+ "description": "The data format for input/output to the model.",
+ "type": "string",
+ "examples": [ "string", "image", "time-series"]
+ }
+ }
+ },
+ "componentData": {
+ "type": "object",
+ "additionalProperties": false,
+ "required": [
+ "type"
+ ],
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the dataset elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
+ },
+ "type": {
+ "type": "string",
+ "title": "Type of Data",
+ "description": "The general theme or subject matter of the data being specified.",
+ "enum": [
+ "source-code",
+ "configuration",
+ "dataset",
+ "definition",
+ "other"
+ ],
+ "meta:enum": {
+ "source-code": "Any type of code, code snippet, or data-as-code.",
+ "configuration": "Parameters or settings that may be used by other components.",
+ "dataset": "A collection of data.",
+ "definition": "Data that can be used to create new instances of what the definition defines.",
+ "other": "Any other type of data that does not fit into existing definitions."
+ }
+ },
+ "name": {
+ "title": "Dataset Name",
+ "description": "The name of the dataset.",
+ "type": "string"
+ },
+ "contents": {
+ "type": "object",
+ "title": "Data Contents",
+ "description": "The contents or references to the contents of the data being described.",
+ "additionalProperties": false,
+ "properties": {
+ "attachment": {
+ "title": "Data Attachment",
+ "description": "An optional way to include textual or encoded data.",
+ "$ref": "#/definitions/attachment"
+ },
+ "url": {
+ "type": "string",
+ "title": "Data URL",
+ "description": "The URL to where the data can be retrieved.",
+ "format": "iri-reference"
+ },
+ "properties": {
+ "type": "array",
+ "title": "Configuration Properties",
+ "description": "Provides the ability to document name-value parameters used for configuration.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "classification": {
+ "$ref": "#/definitions/dataClassification"
+ },
+ "sensitiveData": {
+ "type": "array",
+ "title": "Sensitive Data",
+ "description": "A description of any sensitive data in a dataset.",
+ "items": {
+ "type": "string"
+ }
+ },
+ "graphics": { "$ref": "#/definitions/graphicsCollection" },
+ "description": {
+ "title": "Dataset Description",
+ "description": "A description of the dataset. Can describe size of dataset, whether it's used for source code, training, testing, or validation, etc.",
+ "type": "string"
+ },
+ "governance": {
+ "title": "Data Governance",
+ "$ref": "#/definitions/dataGovernance"
+ }
+ }
+ },
+ "dataGovernance": {
+ "type": "object",
+ "title": "Data Governance",
+ "description": "Data governance captures information regarding data ownership, stewardship, and custodianship, providing insights into the individuals or entities responsible for managing, overseeing, and safeguarding the data throughout its lifecycle.",
+ "additionalProperties": false,
+ "properties": {
+ "custodians": {
+ "type": "array",
+ "title": "Data Custodians",
+ "description": "Data custodians are responsible for the safe custody, transport, and storage of data.",
+ "items": { "$ref": "#/definitions/dataGovernanceResponsibleParty" }
+ },
+ "stewards": {
+ "type": "array",
+ "title": "Data Stewards",
+ "description": "Data stewards are responsible for data content, context, and associated business rules.",
+ "items": { "$ref": "#/definitions/dataGovernanceResponsibleParty" }
+ },
+ "owners": {
+ "type": "array",
+ "title": "Data Owners",
+ "description": "Data owners are concerned with risk and appropriate access to data.",
+ "items": { "$ref": "#/definitions/dataGovernanceResponsibleParty" }
+ }
+ }
+ },
+ "dataGovernanceResponsibleParty": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "organization": {
+ "title": "Organization",
+ "description": "The organization that is responsible for specific data governance role(s).",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "contact": {
+ "title": "Individual",
+ "description": "The individual that is responsible for specific data governance role(s).",
+ "$ref": "#/definitions/organizationalContact"
+ }
+ },
+ "oneOf":[
+ {
+ "required": ["organization"]
+ },
+ {
+ "required": ["contact"]
+ }
+ ]
+ },
+ "graphicsCollection": {
+ "type": "object",
+ "title": "Graphics Collection",
+ "description": "A collection of graphics that represent various measurements.",
+ "additionalProperties": false,
+ "properties": {
+ "description": {
+ "title": "Description",
+ "description": "A description of this collection of graphics.",
+ "type": "string"
+ },
+ "collection": {
+ "title": "Collection",
+ "description": "A collection of graphics.",
+ "type": "array",
+ "items": { "$ref": "#/definitions/graphic" }
+ }
+ }
+ },
+ "graphic": {
+ "type": "object",
+ "title": "Graphic",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "title": "Name",
+ "description": "The name of the graphic.",
+ "type": "string"
+ },
+ "image": {
+ "title": "Graphic Image",
+ "description": "The graphic (vector or raster). Base64 encoding must be specified for binary images.",
+ "$ref": "#/definitions/attachment"
+ }
+ }
+ },
+ "performanceMetric": {
+ "type": "object",
+ "title": "Performance Metric",
+ "additionalProperties": false,
+ "properties": {
+ "type": {
+ "title": "Type",
+ "description": "The type of performance metric.",
+ "type": "string"
+ },
+ "value": {
+ "title": "Value",
+ "description": "The value of the performance metric.",
+ "type": "string"
+ },
+ "slice": {
+ "title": "Slice",
+ "description": "The name of the slice this metric was computed on. By default, assume this metric is not sliced.",
+ "type": "string"
+ },
+ "confidenceInterval": {
+ "title": "Confidence Interval",
+ "description": "The confidence interval of the metric.",
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "lowerBound": {
+ "title": "Lower Bound",
+ "description": "The lower bound of the confidence interval.",
+ "type": "string"
+ },
+ "upperBound": {
+ "title": "Upper Bound",
+ "description": "The upper bound of the confidence interval.",
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+ "risk": {
+ "type": "object",
+ "title": "Risk",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "title": "Name",
+ "description": "The name of the risk.",
+ "type": "string"
+ },
+ "mitigationStrategy": {
+ "title": "Mitigation Strategy",
+ "description": "Strategy used to address this risk.",
+ "type": "string"
+ }
+ }
+ },
+ "fairnessAssessment": {
+ "type": "object",
+ "title": "Fairness Assessment",
+ "description": "Information about the benefits and harms of the model to an identified at risk group.",
+ "additionalProperties": false,
+ "properties": {
+ "groupAtRisk": {
+ "type": "string",
+ "title": "Group at Risk",
+ "description": "The groups or individuals at risk of being systematically disadvantaged by the model."
+ },
+ "benefits": {
+ "type": "string",
+ "title": "Benefits",
+ "description": "Expected benefits to the identified groups."
+ },
+ "harms": {
+ "type": "string",
+ "title": "Harms",
+ "description": "Expected harms to the identified groups."
+ },
+ "mitigationStrategy": {
+ "type": "string",
+ "title": "Mitigation Strategy",
+ "description": "With respect to the benefits and harms outlined, please describe any mitigation strategy implemented."
+ }
+ }
+ },
+ "dataClassification": {
+ "type": "string",
+ "title": "Data Classification",
+ "description": "Data classification tags data according to its type, sensitivity, and value if altered, stolen, or destroyed."
+ },
+ "environmentalConsiderations": {
+ "type": "object",
+ "title": "Environmental Considerations",
+ "description": "Describes various environmental impact metrics.",
+ "additionalProperties": false,
+ "properties": {
+ "energyConsumptions": {
+ "title": "Energy Consumptions",
+ "description": "Describes energy consumption information incurred for one or more component lifecycle activities.",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/energyConsumption"
+ }
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "energyConsumption": {
+ "title": "Energy consumption",
+ "description": "Describes energy consumption information incurred for the specified lifecycle activity.",
+ "type": "object",
+ "required": [
+ "activity",
+ "energyProviders",
+ "activityEnergyCost"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "activity": {
+ "type": "string",
+ "title": "Activity",
+ "description": "The type of activity that is part of a machine learning model development or operational lifecycle.",
+ "enum": [
+ "design",
+ "data-collection",
+ "data-preparation",
+ "training",
+ "fine-tuning",
+ "validation",
+ "deployment",
+ "inference",
+ "other"
+ ],
+ "meta:enum": {
+ "design": "A model design including problem framing, goal definition and algorithm selection.",
+ "data-collection": "Model data acquisition including search, selection and transfer.",
+ "data-preparation": "Model data preparation including data cleaning, labeling and conversion.",
+ "training": "Model building, training and generalized tuning.",
+ "fine-tuning": "Refining a trained model to produce desired outputs for a given problem space.",
+ "validation": "Model validation including model output evaluation and testing.",
+ "deployment": "Explicit model deployment to a target hosting infrastructure.",
+ "inference": "Generating an output response from a hosted model from a set of inputs.",
+ "other": "A lifecycle activity type whose description does not match currently defined values."
+ }
+ },
+ "energyProviders": {
+ "title": "Energy Providers",
+ "description": "The provider(s) of the energy consumed by the associated model development lifecycle activity.",
+ "type": "array",
+ "items": { "$ref": "#/definitions/energyProvider" }
+ },
+ "activityEnergyCost": {
+ "title": "Activity Energy Cost",
+ "description": "The total energy cost associated with the model lifecycle activity.",
+ "$ref": "#/definitions/energyMeasure"
+ },
+ "co2CostEquivalent": {
+ "title": "CO2 Equivalent Cost",
+ "description": "The CO2 cost (debit) equivalent to the total energy cost.",
+ "$ref": "#/definitions/co2Measure"
+ },
+ "co2CostOffset": {
+ "title": "CO2 Cost Offset",
+ "description": "The CO2 offset (credit) for the CO2 equivalent cost.",
+ "$ref": "#/definitions/co2Measure"
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "energyMeasure": {
+ "type": "object",
+ "title": "Energy Measure",
+ "description": "A measure of energy.",
+ "required": [
+ "value",
+ "unit"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "value": {
+ "type": "number",
+ "title": "Value",
+ "description": "Quantity of energy."
+ },
+ "unit": {
+ "type": "string",
+ "enum": [ "kWh" ],
+ "title": "Unit",
+ "description": "Unit of energy.",
+ "meta:enum": {
+ "kWh": "Kilowatt-hour (kWh) is the energy delivered by one kilowatt (kW) of power for one hour (h)."
+ }
+ }
+ }
+ },
+ "co2Measure": {
+ "type": "object",
+ "title": "CO2 Measure",
+ "description": "A measure of carbon dioxide (CO2).",
+ "required": [
+ "value",
+ "unit"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "value": {
+ "type": "number",
+ "title": "Value",
+ "description": "Quantity of carbon dioxide (CO2)."
+ },
+ "unit": {
+ "type": "string",
+ "enum": [ "tCO2eq" ],
+ "title": "Unit",
+ "description": "Unit of carbon dioxide (CO2).",
+ "meta:enum": {
+ "tCO2eq": "Tonnes (t) of carbon dioxide (CO2) equivalent (eq)."
+ }
+ }
+ }
+ },
+ "energyProvider": {
+ "type": "object",
+ "title": "Energy Provider",
+ "description": "Describes the physical provider of energy used for model development or operations.",
+ "required": [
+ "organization",
+ "energySource",
+ "energyProvided"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the energy provider elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links.",
+ "$ref": "#/definitions/refType"
+ },
+ "description": {
+ "type": "string",
+ "title": "Description",
+ "description": "A description of the energy provider."
+ },
+ "organization": {
+ "type": "object",
+ "title": "Organization",
+ "description": "The organization that provides energy.",
+ "$ref": "#/definitions/organizationalEntity"
+ },
+ "energySource": {
+ "type": "string",
+ "enum": [
+ "coal",
+ "oil",
+ "natural-gas",
+ "nuclear",
+ "wind",
+ "solar",
+ "geothermal",
+ "hydropower",
+ "biofuel",
+ "unknown",
+ "other"
+ ],
+ "meta:enum": {
+ "coal": "Energy produced by types of coal.",
+ "oil": "Petroleum products (primarily crude oil and its derivative fuel oils).",
+ "natural-gas": "Hydrocarbon gas liquids (HGL) that occur as gases at atmospheric pressure and as liquids under higher pressures including Natural gas (C5H12 and heavier), Ethane (C2H6), Propane (C3H8), etc.",
+ "nuclear": "Energy produced from the cores of atoms (i.e., through nuclear fission or fusion).",
+ "wind": "Energy produced from moving air.",
+ "solar": "Energy produced from the sun (i.e., solar radiation).",
+ "geothermal": "Energy produced from heat within the earth.",
+ "hydropower": "Energy produced from flowing water.",
+ "biofuel": "Liquid fuels produced from biomass feedstocks (i.e., organic materials such as plants or animals).",
+ "unknown": "The energy source is unknown.",
+ "other": "An energy source that is not listed."
+ },
+ "title": "Energy Source",
+ "description": "The energy source for the energy provider."
+ },
+ "energyProvided": {
+ "$ref": "#/definitions/energyMeasure",
+ "title": "Energy Provided",
+ "description": "The energy provided by the energy source for an associated activity."
+ },
+ "externalReferences": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/externalReference"},
+ "title": "External References",
+ "description": "External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM."
+ }
+ }
+ },
+ "postalAddress": {
+ "type": "object",
+ "title": "Postal address",
+ "description": "An address used to identify a contactable location.",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the address elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links.",
+ "$ref": "#/definitions/refType"
+ },
+ "country": {
+ "type": "string",
+ "title": "Country",
+ "description": "The country name or the two-letter ISO 3166-1 country code."
+ },
+ "region": {
+ "type": "string",
+ "title": "Region",
+ "description": "The region or state in the country.",
+ "examples": [ "Texas" ]
+ },
+ "locality": {
+ "type": "string",
+ "title": "Locality",
+ "description": "The locality or city within the country.",
+ "examples": [ "Austin" ]
+ },
+ "postOfficeBoxNumber": {
+ "type": "string",
+ "title": "Post Office Box Number",
+ "description": "The post office box number.",
+ "examples": [ "901" ]
+ },
+ "postalCode": {
+ "type": "string",
+ "title": "Postal Code",
+ "description": "The postal code.",
+ "examples": [ "78758" ]
+ },
+ "streetAddress": {
+ "type": "string",
+ "title": "Street Address",
+ "description": "The street address.",
+ "examples": [ "100 Main Street" ]
+ }
+ }
+ },
+ "formula": {
+ "title": "Formula",
+ "description": "Describes workflows and resources that captures rules and other aspects of how the associated BOM component or service was formed.",
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the formula elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links.",
+ "$ref": "#/definitions/refType"
+ },
+ "components": {
+ "title": "Components",
+ "description": "Transient components that are used in tasks that constitute one or more of this formula's workflows",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/component"
+ },
+ "uniqueItems": true
+ },
+ "services": {
+ "title": "Services",
+ "description": "Transient services that are used in tasks that constitute one or more of this formula's workflows",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/service"
+ },
+ "uniqueItems": true
+ },
+ "workflows": {
+ "title": "Workflows",
+ "description": "List of workflows that can be declared to accomplish specific orchestrated goals and independently triggered.",
+ "$comment": "Different workflows can be designed to work together to perform end-to-end CI/CD builds and deployments.",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/workflow"
+ },
+ "uniqueItems": true
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "workflow": {
+ "title": "Workflow",
+ "description": "A specialized orchestration task.",
+ "$comment": "Workflow are as task themselves and can trigger other workflow tasks. These relationships can be modeled in the taskDependencies graph.",
+ "type": "object",
+ "required": [
+ "bom-ref",
+ "uid",
+ "taskTypes"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the workflow elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links.",
+ "$ref": "#/definitions/refType"
+ },
+ "uid": {
+ "title": "Unique Identifier (UID)",
+ "description": "The unique identifier for the resource instance within its deployment context.",
+ "type": "string"
+ },
+ "name": {
+ "title": "Name",
+ "description": "The name of the resource instance.",
+ "type": "string"
+ },
+ "description": {
+ "title": "Description",
+ "description": "A description of the resource instance.",
+ "type": "string"
+ },
+ "resourceReferences": {
+ "title": "Resource references",
+ "description": "References to component or service resources that are used to realize the resource instance.",
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/resourceReferenceChoice"
+ }
+ },
+ "tasks": {
+ "title": "Tasks",
+ "description": "The tasks that comprise the workflow.",
+ "$comment": "Note that tasks can appear more than once as different instances (by name or UID).",
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/task"
+ }
+ },
+ "taskDependencies": {
+ "title": "Task dependency graph",
+ "description": "The graph of dependencies between tasks within the workflow.",
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/dependency"
+ }
+ },
+ "taskTypes": {
+ "title": "Task types",
+ "description": "Indicates the types of activities performed by the set of workflow tasks.",
+ "$comment": "Currently, these types reflect common CI/CD actions.",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/taskType"
+ }
+ },
+ "trigger": {
+ "title": "Trigger",
+ "description": "The trigger that initiated the task.",
+ "$ref": "#/definitions/trigger"
+ },
+ "steps": {
+ "title": "Steps",
+ "description": "The sequence of steps for the task.",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/step"
+ },
+ "uniqueItems": true
+ },
+ "inputs": {
+ "title": "Inputs",
+ "description": "Represents resources and data brought into a task at runtime by executor or task commands",
+ "examples": ["a `configuration` file which was declared as a local `component` or `externalReference`"],
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/inputType"
+ },
+ "uniqueItems": true
+ },
+ "outputs": {
+ "title": "Outputs",
+ "description": "Represents resources and data output from a task at runtime by executor or task commands",
+ "examples": ["a log file or metrics data produced by the task"],
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/outputType"
+ },
+ "uniqueItems": true
+ },
+ "timeStart": {
+ "title": "Time start",
+ "description": "The date and time (timestamp) when the task started.",
+ "type": "string",
+ "format": "date-time"
+ },
+ "timeEnd": {
+ "title": "Time end",
+ "description": "The date and time (timestamp) when the task ended.",
+ "type": "string",
+ "format": "date-time"
+ },
+ "workspaces": {
+ "title": "Workspaces",
+ "description": "A set of named filesystem or data resource shareable by workflow tasks.",
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/workspace"
+ }
+ },
+ "runtimeTopology": {
+ "title": "Runtime topology",
+ "description": "A graph of the component runtime topology for workflow's instance.",
+ "$comment": "A description of the runtime component and service topology. This can describe a partial or complete topology used to host and execute the task (e.g., hardware, operating systems, configurations, etc.),",
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/dependency"
+ }
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "task": {
+ "title": "Task",
+ "description": "Describes the inputs, sequence of steps and resources used to accomplish a task and its output.",
+ "$comment": "Tasks are building blocks for constructing assemble CI/CD workflows or pipelines.",
+ "type": "object",
+ "required": [
+ "bom-ref",
+ "uid",
+ "taskTypes"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the task elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links.",
+ "$ref": "#/definitions/refType"
+ },
+ "uid": {
+ "title": "Unique Identifier (UID)",
+ "description": "The unique identifier for the resource instance within its deployment context.",
+ "type": "string"
+ },
+ "name": {
+ "title": "Name",
+ "description": "The name of the resource instance.",
+ "type": "string"
+ },
+ "description": {
+ "title": "Description",
+ "description": "A description of the resource instance.",
+ "type": "string"
+ },
+ "resourceReferences": {
+ "title": "Resource references",
+ "description": "References to component or service resources that are used to realize the resource instance.",
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/resourceReferenceChoice"
+ }
+ },
+ "taskTypes": {
+ "title": "Task types",
+ "description": "Indicates the types of activities performed by the set of workflow tasks.",
+ "$comment": "Currently, these types reflect common CI/CD actions.",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/taskType"
+ }
+ },
+ "trigger": {
+ "title": "Trigger",
+ "description": "The trigger that initiated the task.",
+ "$ref": "#/definitions/trigger"
+ },
+ "steps": {
+ "title": "Steps",
+ "description": "The sequence of steps for the task.",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/step"
+ },
+ "uniqueItems": true
+ },
+ "inputs": {
+ "title": "Inputs",
+ "description": "Represents resources and data brought into a task at runtime by executor or task commands",
+ "examples": ["a `configuration` file which was declared as a local `component` or `externalReference`"],
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/inputType"
+ },
+ "uniqueItems": true
+ },
+ "outputs": {
+ "title": "Outputs",
+ "description": "Represents resources and data output from a task at runtime by executor or task commands",
+ "examples": ["a log file or metrics data produced by the task"],
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/outputType"
+ },
+ "uniqueItems": true
+ },
+ "timeStart": {
+ "title": "Time start",
+ "description": "The date and time (timestamp) when the task started.",
+ "type": "string",
+ "format": "date-time"
+ },
+ "timeEnd": {
+ "title": "Time end",
+ "description": "The date and time (timestamp) when the task ended.",
+ "type": "string",
+ "format": "date-time"
+ },
+ "workspaces": {
+ "title": "Workspaces",
+ "description": "A set of named filesystem or data resource shareable by workflow tasks.",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/workspace"
+ },
+ "uniqueItems": true
+ },
+ "runtimeTopology": {
+ "title": "Runtime topology",
+ "description": "A graph of the component runtime topology for task's instance.",
+ "$comment": "A description of the runtime component and service topology. This can describe a partial or complete topology used to host and execute the task (e.g., hardware, operating systems, configurations, etc.),",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/dependency"
+ },
+ "uniqueItems": true
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "step": {
+ "type": "object",
+ "description": "Executes specific commands or tools in order to accomplish its owning task as part of a sequence.",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "title": "Name",
+ "description": "A name for the step.",
+ "type": "string"
+ },
+ "description": {
+ "title": "Description",
+ "description": "A description of the step.",
+ "type": "string"
+ },
+ "commands": {
+ "title": "Commands",
+ "description": "Ordered list of commands or directives for the step",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/command"
+ }
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "command": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "executed": {
+ "title": "Executed",
+ "description": "A text representation of the executed command.",
+ "type": "string"
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "workspace": {
+ "title": "Workspace",
+ "description": "A named filesystem or data resource shareable by workflow tasks.",
+ "type": "object",
+ "required": [
+ "bom-ref",
+ "uid"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the workspace elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links.",
+ "$ref": "#/definitions/refType"
+ },
+ "uid": {
+ "title": "Unique Identifier (UID)",
+ "description": "The unique identifier for the resource instance within its deployment context.",
+ "type": "string"
+ },
+ "name": {
+ "title": "Name",
+ "description": "The name of the resource instance.",
+ "type": "string"
+ },
+ "aliases": {
+ "title": "Aliases",
+ "description": "The names for the workspace as referenced by other workflow tasks. Effectively, a name mapping so other tasks can use their own local name in their steps.",
+ "type": "array",
+ "items": {"type": "string"}
+ },
+ "description": {
+ "title": "Description",
+ "description": "A description of the resource instance.",
+ "type": "string"
+ },
+ "resourceReferences": {
+ "title": "Resource references",
+ "description": "References to component or service resources that are used to realize the resource instance.",
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/resourceReferenceChoice"
+ }
+ },
+ "accessMode": {
+ "title": "Access mode",
+ "description": "Describes the read-write access control for the workspace relative to the owning resource instance.",
+ "type": "string",
+ "enum": [
+ "read-only",
+ "read-write",
+ "read-write-once",
+ "write-once",
+ "write-only"
+ ]
+ },
+ "mountPath": {
+ "title": "Mount path",
+ "description": "A path to a location on disk where the workspace will be available to the associated task's steps.",
+ "type": "string"
+ },
+ "managedDataType": {
+ "title": "Managed data type",
+ "description": "The name of a domain-specific data type the workspace represents.",
+ "$comment": "This property is for CI/CD frameworks that are able to provide access to structured, managed data at a more granular level than a filesystem.",
+ "examples": ["ConfigMap","Secret"],
+ "type": "string"
+ },
+ "volumeRequest": {
+ "title": "Volume request",
+ "description": "Identifies the reference to the request for a specific volume type and parameters.",
+ "examples": ["a kubernetes Persistent Volume Claim (PVC) name"],
+ "type": "string"
+ },
+ "volume": {
+ "title": "Volume",
+ "description": "Information about the actual volume instance allocated to the workspace.",
+ "$comment": "The actual volume allocated may be different than the request.",
+ "examples": ["see https://kubernetes.io/docs/concepts/storage/persistent-volumes/"],
+ "$ref": "#/definitions/volume"
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "volume": {
+ "title": "Volume",
+ "description": "An identifiable, logical unit of data storage tied to a physical device.",
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "uid": {
+ "title": "Unique Identifier (UID)",
+ "description": "The unique identifier for the volume instance within its deployment context.",
+ "type": "string"
+ },
+ "name": {
+ "title": "Name",
+ "description": "The name of the volume instance",
+ "type": "string"
+ },
+ "mode": {
+ "title": "Mode",
+ "description": "The mode for the volume instance.",
+ "type": "string",
+ "enum": [
+ "filesystem", "block"
+ ],
+ "default": "filesystem"
+ },
+ "path": {
+ "title": "Path",
+ "description": "The underlying path created from the actual volume.",
+ "type": "string"
+ },
+ "sizeAllocated": {
+ "title": "Size allocated",
+ "description": "The allocated size of the volume accessible to the associated workspace. This should include the scalar size as well as IEC standard unit in either decimal or binary form.",
+ "examples": ["10GB", "2Ti", "1Pi"],
+ "type": "string"
+ },
+ "persistent": {
+ "title": "Persistent",
+ "description": "Indicates if the volume persists beyond the life of the resource it is associated with.",
+ "type": "boolean"
+ },
+ "remote": {
+ "title": "Remote",
+ "description": "Indicates if the volume is remotely (i.e., network) attached.",
+ "type": "boolean"
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "trigger": {
+ "title": "Trigger",
+ "description": "Represents a resource that can conditionally activate (or fire) tasks based upon associated events and their data.",
+ "type": "object",
+ "additionalProperties": false,
+ "required": [
+ "type",
+ "bom-ref",
+ "uid"
+ ],
+ "properties": {
+ "bom-ref": {
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the trigger elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links.",
+ "$ref": "#/definitions/refType"
+ },
+ "uid": {
+ "title": "Unique Identifier (UID)",
+ "description": "The unique identifier for the resource instance within its deployment context.",
+ "type": "string"
+ },
+ "name": {
+ "title": "Name",
+ "description": "The name of the resource instance.",
+ "type": "string"
+ },
+ "description": {
+ "title": "Description",
+ "description": "A description of the resource instance.",
+ "type": "string"
+ },
+ "resourceReferences": {
+ "title": "Resource references",
+ "description": "References to component or service resources that are used to realize the resource instance.",
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/resourceReferenceChoice"
+ }
+ },
+ "type": {
+ "title": "Type",
+ "description": "The source type of event which caused the trigger to fire.",
+ "type": "string",
+ "enum": [
+ "manual",
+ "api",
+ "webhook",
+ "scheduled"
+ ]
+ },
+ "event": {
+ "title": "Event",
+ "description": "The event data that caused the associated trigger to activate.",
+ "$ref": "#/definitions/event"
+ },
+ "conditions": {
+ "type": "array",
+ "title": "Conditions",
+ "description": "A list of conditions used to determine if a trigger should be activated.",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/condition"
+ }
+ },
+ "timeActivated": {
+ "title": "Time activated",
+ "description": "The date and time (timestamp) when the trigger was activated.",
+ "type": "string",
+ "format": "date-time"
+ },
+ "inputs": {
+ "title": "Inputs",
+ "description": "Represents resources and data brought into a task at runtime by executor or task commands",
+ "examples": ["a `configuration` file which was declared as a local `component` or `externalReference`"],
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/inputType"
+ },
+ "uniqueItems": true
+ },
+ "outputs": {
+ "title": "Outputs",
+ "description": "Represents resources and data output from a task at runtime by executor or task commands",
+ "examples": ["a log file or metrics data produced by the task"],
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/outputType"
+ },
+ "uniqueItems": true
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "event": {
+ "title": "Event",
+ "description": "Represents something that happened that may trigger a response.",
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "uid": {
+ "title": "Unique Identifier (UID)",
+ "description": "The unique identifier of the event.",
+ "type": "string"
+ },
+ "description": {
+ "title": "Description",
+ "description": "A description of the event.",
+ "type": "string"
+ },
+ "timeReceived": {
+ "title": "Time Received",
+ "description": "The date and time (timestamp) when the event was received.",
+ "type": "string",
+ "format": "date-time"
+ },
+ "data": {
+ "title": "Data",
+ "description": "Encoding of the raw event data.",
+ "$ref": "#/definitions/attachment"
+ },
+ "source": {
+ "title": "Source",
+ "description": "References the component or service that was the source of the event",
+ "$ref": "#/definitions/resourceReferenceChoice"
+ },
+ "target": {
+ "title": "Target",
+ "description": "References the component or service that was the target of the event",
+ "$ref": "#/definitions/resourceReferenceChoice"
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "inputType": {
+ "title": "Input type",
+ "description": "Type that represents various input data types and formats.",
+ "type": "object",
+ "oneOf": [
+ {
+ "required": [
+ "resource"
+ ]
+ },
+ {
+ "required": [
+ "parameters"
+ ]
+ },
+ {
+ "required": [
+ "environmentVars"
+ ]
+ },
+ {
+ "required": [
+ "data"
+ ]
+ }
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "source": {
+ "title": "Source",
+ "description": "A reference to the component or service that provided the input to the task (e.g., reference to a service with data flow value of `inbound`)",
+ "examples": [
+ "source code repository",
+ "database"
+ ],
+ "$ref": "#/definitions/resourceReferenceChoice"
+ },
+ "target": {
+ "title": "Target",
+ "description": "A reference to the component or service that received or stored the input if not the task itself (e.g., a local, named storage workspace)",
+ "examples": [
+ "workspace",
+ "directory"
+ ],
+ "$ref": "#/definitions/resourceReferenceChoice"
+ },
+ "resource": {
+ "title": "Resource",
+ "description": "A reference to an independent resource provided as an input to a task by the workflow runtime.",
+ "examples": [
+ "a reference to a configuration file in a repository (i.e., a bom-ref)",
+ "a reference to a scanning service used in a task (i.e., a bom-ref)"
+ ],
+ "$ref": "#/definitions/resourceReferenceChoice"
+ },
+ "parameters": {
+ "title": "Parameters",
+ "description": "Inputs that have the form of parameters with names and values.",
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "$ref": "#/definitions/parameter"
+ }
+ },
+ "environmentVars": {
+ "title": "Environment variables",
+ "description": "Inputs that have the form of parameters with names and values.",
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "oneOf": [
+ {
+ "$ref": "#/definitions/property"
+ },
+ {
+ "type": "string"
+ }
+ ]
+ }
+ },
+ "data": {
+ "title": "Data",
+ "description": "Inputs that have the form of data.",
+ "$ref": "#/definitions/attachment"
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "outputType": {
+ "type": "object",
+ "oneOf": [
+ {
+ "required": [
+ "resource"
+ ]
+ },
+ {
+ "required": [
+ "environmentVars"
+ ]
+ },
+ {
+ "required": [
+ "data"
+ ]
+ }
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "type": {
+ "title": "Type",
+ "description": "Describes the type of data output.",
+ "type": "string",
+ "enum": [
+ "artifact",
+ "attestation",
+ "log",
+ "evidence",
+ "metrics",
+ "other"
+ ]
+ },
+ "source": {
+ "title": "Source",
+ "description": "Component or service that generated or provided the output from the task (e.g., a build tool)",
+ "$ref": "#/definitions/resourceReferenceChoice"
+ },
+ "target": {
+ "title": "Target",
+ "description": "Component or service that received the output from the task (e.g., reference to an artifactory service with data flow value of `outbound`)",
+ "examples": ["a log file described as an `externalReference` within its target domain."],
+ "$ref": "#/definitions/resourceReferenceChoice"
+ },
+ "resource": {
+ "title": "Resource",
+ "description": "A reference to an independent resource generated as output by the task.",
+ "examples": [
+ "configuration file",
+ "source code",
+ "scanning service"
+ ],
+ "$ref": "#/definitions/resourceReferenceChoice"
+ },
+ "data": {
+ "title": "Data",
+ "description": "Outputs that have the form of data.",
+ "$ref": "#/definitions/attachment"
+ },
+ "environmentVars": {
+ "title": "Environment variables",
+ "description": "Outputs that have the form of environment variables.",
+ "type": "array",
+ "items": {
+ "oneOf": [
+ {
+ "$ref": "#/definitions/property"
+ },
+ {
+ "type": "string"
+ }
+ ]
+ },
+ "uniqueItems": true
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "resourceReferenceChoice": {
+ "title": "Resource reference choice",
+ "description": "A reference to a locally defined resource (e.g., a bom-ref) or an externally accessible resource.",
+ "$comment": "Enables reference to a resource that participates in a workflow; using either internal (bom-ref) or external (externalReference) types.",
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "ref": {
+ "title": "BOM Reference",
+ "description": "References an object by its bom-ref attribute",
+ "anyOf": [
+ {
+ "title": "Ref",
+ "$ref": "#/definitions/refLinkType"
+ },
+ {
+ "title": "BOM-Link Element",
+ "$ref": "#/definitions/bomLinkElementType"
+ }
+ ]
+ },
+ "externalReference": {
+ "title": "External reference",
+ "description": "Reference to an externally accessible resource.",
+ "$ref": "#/definitions/externalReference"
+ }
+ },
+ "oneOf": [
+ {
+ "required": [
+ "ref"
+ ]
+ },
+ {
+ "required": [
+ "externalReference"
+ ]
+ }
+ ]
+ },
+ "condition": {
+ "title": "Condition",
+ "description": "A condition that was used to determine a trigger should be activated.",
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "description": {
+ "title": "Description",
+ "description": "Describes the set of conditions which cause the trigger to activate.",
+ "type": "string"
+ },
+ "expression": {
+ "title": "Expression",
+ "description": "The logical expression that was evaluated that determined the trigger should be fired.",
+ "type": "string"
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ }
+ }
+ },
+ "taskType": {
+ "type": "string",
+ "enum": [
+ "copy",
+ "clone",
+ "lint",
+ "scan",
+ "merge",
+ "build",
+ "test",
+ "deliver",
+ "deploy",
+ "release",
+ "clean",
+ "other"
+ ],
+ "meta:enum": {
+ "copy": "A task that copies software or data used to accomplish other tasks in the workflow.",
+ "clone": "A task that clones a software repository into the workflow in order to retrieve its source code or data for use in a build step.",
+ "lint": "A task that checks source code for programmatic and stylistic errors.",
+ "scan": "A task that performs a scan against source code, or built or deployed components and services. Scans are typically run to gather or test for security vulnerabilities or policy compliance.",
+ "merge": "A task that merges changes or fixes into source code prior to a build step in the workflow.",
+ "build": "A task that builds the source code, dependencies and/or data into an artifact that can be deployed to and executed on target systems.",
+ "test": "A task that verifies the functionality of a component or service.",
+ "deliver": "A task that delivers a built artifact to one or more target repositories or storage systems.",
+ "deploy": "A task that deploys a built artifact for execution on one or more target systems.",
+ "release": "A task that releases a built, versioned artifact to a target repository or distribution system.",
+ "clean": "A task that cleans unnecessary tools, build artifacts and/or data from workflow storage.",
+ "other": "A workflow task that does not match current task type definitions."
+ }
+ },
+ "parameter": {
+ "title": "Parameter",
+ "description": "A representation of a functional parameter.",
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "title": "Name",
+ "description": "The name of the parameter.",
+ "type": "string"
+ },
+ "value": {
+ "title": "Value",
+ "description": "The value of the parameter.",
+ "type": "string"
+ },
+ "dataType": {
+ "title": "Data type",
+ "description": "The data type of the parameter.",
+ "type": "string"
+ }
+ }
+ },
+ "componentIdentityEvidence": {
+ "type": "object",
+ "title": "Identity Evidence",
+ "description": "Evidence that substantiates the identity of a component.",
+ "required": [ "field" ],
+ "additionalProperties": false,
+ "properties": {
+ "field": {
+ "type": "string",
+ "enum": [
+ "group", "name", "version", "purl", "cpe", "omniborId", "swhid", "swid", "hash"
+ ],
+ "title": "Field",
+ "description": "The identity field of the component which the evidence describes."
+ },
+ "confidence": {
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "title": "Confidence",
+ "description": "The overall confidence of the evidence from 0 - 1, where 1 is 100% confidence."
+ },
+ "concludedValue": {
+ "type": "string",
+ "title": "Concluded Value",
+ "description": "The value of the field (cpe, purl, etc) that has been concluded based on the aggregate of all methods (if available)."
+ },
+ "methods": {
+ "type": "array",
+ "title": "Methods",
+ "description": "The methods used to extract and/or analyze the evidence.",
+ "items": {
+ "type": "object",
+ "required": [
+ "technique" ,
+ "confidence"
+ ],
+ "additionalProperties": false,
+ "properties": {
+ "technique": {
+ "title": "Technique",
+ "description": "The technique used in this method of analysis.",
+ "type": "string",
+ "enum": [
+ "source-code-analysis",
+ "binary-analysis",
+ "manifest-analysis",
+ "ast-fingerprint",
+ "hash-comparison",
+ "instrumentation",
+ "dynamic-analysis",
+ "filename",
+ "attestation",
+ "other"
+ ]
+ },
+ "confidence": {
+ "type": "number",
+ "minimum": 0,
+ "maximum": 1,
+ "title": "Confidence",
+ "description": "The confidence of the evidence from 0 - 1, where 1 is 100% confidence. Confidence is specific to the technique used. Each technique of analysis can have independent confidence."
+ },
+ "value": {
+ "type": "string",
+ "title": "Value",
+ "description": "The value or contents of the evidence."
+ }
+ }
+ }
+ },
+ "tools": {
+ "type": "array",
+ "uniqueItems": true,
+ "items": {
+ "anyOf": [
+ {
+ "title": "Ref",
+ "$ref": "#/definitions/refLinkType"
+ },
+ {
+ "title": "BOM-Link Element",
+ "$ref": "#/definitions/bomLinkElementType"
+ }
+ ]
+ },
+ "title": "BOM References",
+ "description": "The object in the BOM identified by its bom-ref. This is often a component or service but may be any object type supporting bom-refs. Tools used for analysis should already be defined in the BOM, either in the metadata/tools, components, or formulation."
+ }
+ }
+ },
+ "standard": {
+ "type": "object",
+ "title": "Standard",
+ "description": "A standard may consist of regulations, industry or organizational-specific standards, maturity models, best practices, or any other requirements which can be evaluated against or attested to.",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the object elsewhere in the BOM. Every bom-ref must be unique within the BOM."
+ },
+ "name": {
+ "type": "string",
+ "title": "Name",
+ "description": "The name of the standard. This will often be a shortened, single name of the standard."
+ },
+ "version": {
+ "type": "string",
+ "title": "Version",
+ "description": "The version of the standard."
+ },
+ "description": {
+ "type": "string",
+ "title": "Description",
+ "description": "The description of the standard."
+ },
+ "owner": {
+ "type": "string",
+ "title": "Owner",
+ "description": "The owner of the standard, often the entity responsible for its release."
+ },
+ "requirements": {
+ "type": "array",
+ "title": "Requirements",
+ "description": "The list of requirements comprising the standard.",
+ "items": {
+ "type": "object",
+ "title": "Requirement",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the object elsewhere in the BOM. Every bom-ref must be unique within the BOM."
+ },
+ "identifier": {
+ "type": "string",
+ "title": "Identifier",
+ "description": "The unique identifier used in the standard to identify a specific requirement. This should match what is in the standard and should not be the requirements bom-ref."
+ },
+ "title": {
+ "type": "string",
+ "title": "Title",
+ "description": "The title of the requirement."
+ },
+ "text": {
+ "type": "string",
+ "title": "Text",
+ "description": "The textual content of the requirement."
+ },
+ "descriptions": {
+ "type": "array",
+ "title": "Descriptions",
+ "description": "The supplemental text that provides additional guidance or context to the requirement, but is not directly part of the requirement.",
+ "items": { "type": "string" }
+ },
+ "openCre": {
+ "type": "array",
+ "title": "OWASP OpenCRE Identifier(s)",
+ "description": "The Common Requirements Enumeration (CRE) identifier(s). CRE is a structured and standardized framework for uniting security standards and guidelines. CRE links each section of a resource to a shared topic identifier (a Common Requirement). Through this shared topic link, all resources map to each other. Use of CRE promotes clear and unambiguous communication among stakeholders.",
+ "items": {
+ "type": "string",
+ "pattern": "^CRE:[0-9]+-[0-9]+$",
+ "examples": [ "CRE:764-507" ]
+ }
+ },
+ "parent": {
+ "$ref": "#/definitions/refLinkType",
+ "title": "Parent BOM Reference",
+ "description": "The optional `bom-ref` to a parent requirement. This establishes a hierarchy of requirements. Top-level requirements must not define a parent. Only child requirements should define parents."
+ },
+ "properties": {
+ "type": "array",
+ "title": "Properties",
+ "description": "Provides the ability to document properties in a name-value store. This provides flexibility to include data not officially supported in the standard without having to use additional namespaces or create extensions. Unlike key-value stores, properties support duplicate names, each potentially having different values. Property names of interest to the general public are encouraged to be registered in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy). Formal registration is optional.",
+ "items": {
+ "$ref": "#/definitions/property"
+ }
+ },
+ "externalReferences": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/externalReference"},
+ "title": "External References",
+ "description": "External references provide a way to document systems, sites, and information that may be relevant, but are not included with the BOM. They may also establish specific relationships within or external to the BOM."
+ }
+ }
+ }
+ },
+ "levels": {
+ "type": "array",
+ "title": "Levels",
+ "description": "The list of levels associated with the standard. Some standards have different levels of compliance.",
+ "items": {
+ "type": "object",
+ "title": "Level",
+ "additionalProperties": false,
+ "properties": {
+ "bom-ref": {
+ "$ref": "#/definitions/refType",
+ "title": "BOM Reference",
+ "description": "An optional identifier which can be used to reference the object elsewhere in the BOM. Every bom-ref must be unique within the BOM."
+ },
+ "identifier": {
+ "type": "string",
+ "title": "Identifier",
+ "description": "The identifier used in the standard to identify a specific level."
+ },
+ "title": {
+ "type": "string",
+ "title": "Title",
+ "description": "The title of the level."
+ },
+ "description": {
+ "type": "string",
+ "title": "Description",
+ "description": "The description of the level."
+ },
+ "requirements": {
+ "type": "array",
+ "title": "Requirements",
+ "description": "The list of requirement `bom-ref`s that comprise the level.",
+ "items": { "$ref": "#/definitions/refLinkType" }
+ }
+ }
+ }
+ },
+ "externalReferences": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/externalReference"},
+ "title": "External References",
+ "description": "External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM."
+ },
+ "signature": {
+ "$ref": "#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ }
+ }
+ },
+ "signature": {
+ "$ref": "jsf-0.82.schema.json#/definitions/signature",
+ "title": "Signature",
+ "description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
+ },
+ "cryptoProperties": {
+ "type": "object",
+ "title": "Cryptographic Properties",
+ "description": "Cryptographic assets have properties that uniquely define them and that make them actionable for further reasoning. As an example, it makes a difference if one knows the algorithm family (e.g. AES) or the specific variant or instantiation (e.g. AES-128-GCM). This is because the security level and the algorithm primitive (authenticated encryption) are only defined by the definition of the algorithm variant. The presence of a weak cryptographic algorithm like SHA1 vs. HMAC-SHA1 also makes a difference.",
+ "additionalProperties": false,
+ "required": [
+ "assetType"
+ ],
+ "properties": {
+ "assetType": {
+ "type": "string",
+ "title": "Asset Type",
+ "description": "Cryptographic assets occur in several forms. Algorithms and protocols are most commonly implemented in specialized cryptographic libraries. They may, however, also be 'hardcoded' in software components. Certificates and related cryptographic material like keys, tokens, secrets or passwords are other cryptographic assets to be modelled.",
+ "enum": [
+ "algorithm",
+ "certificate",
+ "protocol",
+ "related-crypto-material"
+ ],
+ "meta:enum": {
+ "algorithm": "Mathematical function commonly used for data encryption, authentication, and digital signatures.",
+ "certificate": "An electronic document that is used to provide the identity or validate a public key.",
+ "protocol": "A set of rules and guidelines that govern the behavior and communication with each other.",
+ "related-crypto-material": "Other cryptographic assets related to algorithms, certificates, and protocols such as keys and tokens."
+ }
+ },
+ "algorithmProperties": {
+ "type": "object",
+ "title": "Algorithm Properties",
+ "description": "Additional properties specific to a cryptographic algorithm.",
+ "additionalProperties": false,
+ "properties": {
+ "primitive": {
+ "type": "string",
+ "title": "primitive",
+ "description": "Cryptographic building blocks used in higher-level cryptographic systems and protocols. Primitives represent different cryptographic routines: deterministic random bit generators (drbg, e.g. CTR_DRBG from NIST SP800-90A-r1), message authentication codes (mac, e.g. HMAC-SHA-256), blockciphers (e.g. AES), streamciphers (e.g. Salsa20), signatures (e.g. ECDSA), hash functions (e.g. SHA-256), public-key encryption schemes (pke, e.g. RSA), extended output functions (xof, e.g. SHAKE256), key derivation functions (e.g. pbkdf2), key agreement algorithms (e.g. ECDH), key encapsulation mechanisms (e.g. ML-KEM), authenticated encryption (ae, e.g. AES-GCM) and the combination of multiple algorithms (combiner, e.g. SP800-56Cr2).",
+ "enum": [
+ "drbg",
+ "mac",
+ "block-cipher",
+ "stream-cipher",
+ "signature",
+ "hash",
+ "pke",
+ "xof",
+ "kdf",
+ "key-agree",
+ "kem",
+ "ae",
+ "combiner",
+ "other",
+ "unknown"
+ ],
+ "meta:enum": {
+ "drbg": "Deterministic Random Bit Generator (DRBG) is a type of pseudorandom number generator designed to produce a sequence of bits from an initial seed value. DRBGs are commonly used in cryptographic applications where reproducibility of random values is important.",
+ "mac": "In cryptography, a Message Authentication Code (MAC) is information used for authenticating and integrity-checking a message.",
+ "block-cipher": "A block cipher is a symmetric key algorithm that operates on fixed-size blocks of data. It encrypts or decrypts the data in block units, providing confidentiality. Block ciphers are widely used in various cryptographic modes and protocols for secure data transmission.",
+ "stream-cipher": "A stream cipher is a symmetric key cipher where plaintext digits are combined with a pseudorandom cipher digit stream (keystream).",
+ "signature": "In cryptography, a signature is a digital representation of a message or data that proves its origin, identity, and integrity. Digital signatures are generated using cryptographic algorithms and are widely used for authentication and verification in secure communication.",
+ "hash": "A hash function is a mathematical algorithm that takes an input (or 'message') and produces a fixed-size string of characters, which is typically a hash value. Hash functions are commonly used in various cryptographic applications, including data integrity verification and password hashing.",
+ "pke": "Public Key Encryption (PKE) is a type of encryption that uses a pair of public and private keys for secure communication. The public key is used for encryption, while the private key is used for decryption. PKE is a fundamental component of public-key cryptography.",
+ "xof": "An XOF is an extendable output function that can take arbitrary input and creates a stream of output, up to a limit determined by the size of the internal state of the hash function that underlies the XOF.",
+ "kdf": "A Key Derivation Function (KDF) derives key material from another source of entropy while preserving the entropy of the input.",
+ "key-agree": "In cryptography, a key-agreement is a protocol whereby two or more parties agree on a cryptographic key in such a way that both influence the outcome.",
+ "kem": "A Key Encapsulation Mechanism (KEM) algorithm is a mechanism for transporting random keying material to a recipient using the recipient's public key.",
+ "ae": "Authenticated Encryption (AE) is a cryptographic process that provides both confidentiality and data integrity. It ensures that the encrypted data has not been tampered with and comes from a legitimate source. AE is commonly used in secure communication protocols.",
+ "combiner": "A combiner aggregates many candidates for a cryptographic primitive and generates a new candidate for the same primitive.",
+ "other": "Another primitive type.",
+ "unknown": "The primitive is not known."
+ }
+ },
+ "parameterSetIdentifier": {
+ "type": "string",
+ "title": "Parameter Set Identifier",
+ "description": "An identifier for the parameter set of the cryptographic algorithm. Examples: in AES128, '128' identifies the key length in bits, in SHA256, '256' identifies the digest length, '128' in SHAKE128 identifies its maximum security level in bits, and 'SHA2-128s' identifies a parameter set used in SLH-DSA (FIPS205)."
+ },
+ "curve": {
+ "type": "string",
+ "title": "Elliptic Curve",
+ "description": "The specific underlying Elliptic Curve (EC) definition employed which is an indicator of the level of security strength, performance and complexity. Absent an authoritative source of curve names, CycloneDX recommends using curve names as defined at [https://neuromancer.sk/std/](https://neuromancer.sk/std/), the source of which can be found at [https://github.com/J08nY/std-curves](https://github.com/J08nY/std-curves)."
+ },
+ "executionEnvironment": {
+ "type": "string",
+ "title": "Execution Environment",
+ "description": "The target and execution environment in which the algorithm is implemented in.",
+ "enum": [
+ "software-plain-ram",
+ "software-encrypted-ram",
+ "software-tee",
+ "hardware",
+ "other",
+ "unknown"
+ ],
+ "meta:enum": {
+ "software-plain-ram": "A software implementation running in plain unencrypted RAM.",
+ "software-encrypted-ram": "A software implementation running in encrypted RAM.",
+ "software-tee": "A software implementation running in a trusted execution environment.",
+ "hardware": "A hardware implementation.",
+ "other": "Another implementation environment.",
+ "unknown": "The execution environment is not known."
+ }
+ },
+ "implementationPlatform": {
+ "type": "string",
+ "title": "Implementation platform",
+ "description": "The target platform for which the algorithm is implemented. The implementation can be 'generic', running on any platform or for a specific platform.",
+ "enum": [
+ "generic",
+ "x86_32",
+ "x86_64",
+ "armv7-a",
+ "armv7-m",
+ "armv8-a",
+ "armv8-m",
+ "armv9-a",
+ "armv9-m",
+ "s390x",
+ "ppc64",
+ "ppc64le",
+ "other",
+ "unknown"
+ ]
+ },
+ "certificationLevel": {
+ "type": "array",
+ "title": "Certification Level",
+ "description": "The certification that the implementation of the cryptographic algorithm has received, if any. Certifications include revisions and levels of FIPS 140 or Common Criteria of different Extended Assurance Levels (CC-EAL).",
+ "items": {
+ "type": "string",
+ "enum": [
+ "none",
+ "fips140-1-l1",
+ "fips140-1-l2",
+ "fips140-1-l3",
+ "fips140-1-l4",
+ "fips140-2-l1",
+ "fips140-2-l2",
+ "fips140-2-l3",
+ "fips140-2-l4",
+ "fips140-3-l1",
+ "fips140-3-l2",
+ "fips140-3-l3",
+ "fips140-3-l4",
+ "cc-eal1",
+ "cc-eal1+",
+ "cc-eal2",
+ "cc-eal2+",
+ "cc-eal3",
+ "cc-eal3+",
+ "cc-eal4",
+ "cc-eal4+",
+ "cc-eal5",
+ "cc-eal5+",
+ "cc-eal6",
+ "cc-eal6+",
+ "cc-eal7",
+ "cc-eal7+",
+ "other",
+ "unknown"
+ ],
+ "meta:enum": {
+ "none": "No certification obtained",
+ "fips140-1-l1": "FIPS 140-1 Level 1",
+ "fips140-1-l2": "FIPS 140-1 Level 2",
+ "fips140-1-l3": "FIPS 140-1 Level 3",
+ "fips140-1-l4": "FIPS 140-1 Level 4",
+ "fips140-2-l1": "FIPS 140-2 Level 1",
+ "fips140-2-l2": "FIPS 140-2 Level 2",
+ "fips140-2-l3": "FIPS 140-2 Level 3",
+ "fips140-2-l4": "FIPS 140-2 Level 4",
+ "fips140-3-l1": "FIPS 140-3 Level 1",
+ "fips140-3-l2": "FIPS 140-3 Level 2",
+ "fips140-3-l3": "FIPS 140-3 Level 3",
+ "fips140-3-l4": "FIPS 140-3 Level 4",
+ "cc-eal1": "Common Criteria - Evaluation Assurance Level 1",
+ "cc-eal1+": "Common Criteria - Evaluation Assurance Level 1 (Augmented)",
+ "cc-eal2": "Common Criteria - Evaluation Assurance Level 2",
+ "cc-eal2+": "Common Criteria - Evaluation Assurance Level 2 (Augmented)",
+ "cc-eal3": "Common Criteria - Evaluation Assurance Level 3",
+ "cc-eal3+": "Common Criteria - Evaluation Assurance Level 3 (Augmented)",
+ "cc-eal4": "Common Criteria - Evaluation Assurance Level 4",
+ "cc-eal4+": "Common Criteria - Evaluation Assurance Level 4 (Augmented)",
+ "cc-eal5": "Common Criteria - Evaluation Assurance Level 5",
+ "cc-eal5+": "Common Criteria - Evaluation Assurance Level 5 (Augmented)",
+ "cc-eal6": "Common Criteria - Evaluation Assurance Level 6",
+ "cc-eal6+": "Common Criteria - Evaluation Assurance Level 6 (Augmented)",
+ "cc-eal7": "Common Criteria - Evaluation Assurance Level 7",
+ "cc-eal7+": "Common Criteria - Evaluation Assurance Level 7 (Augmented)",
+ "other": "Another certification",
+ "unknown": "The certification level is not known"
+ }
+ }
+ },
+ "mode": {
+ "type": "string",
+ "title": "Mode",
+ "description": "The mode of operation in which the cryptographic algorithm (block cipher) is used.",
+ "enum": [
+ "cbc",
+ "ecb",
+ "ccm",
+ "gcm",
+ "cfb",
+ "ofb",
+ "ctr",
+ "other",
+ "unknown"
+ ],
+ "meta:enum": {
+ "cbc": "Cipher block chaining",
+ "ecb": "Electronic codebook",
+ "ccm": "Counter with cipher block chaining message authentication code",
+ "gcm": "Galois/counter",
+ "cfb": "Cipher feedback",
+ "ofb": "Output feedback",
+ "ctr": "Counter",
+ "other": "Another mode of operation",
+ "unknown": "The mode of operation is not known"
+ }
+ },
+ "padding": {
+ "type": "string",
+ "title": "Padding",
+ "description": "The padding scheme that is used for the cryptographic algorithm.",
+ "enum": [
+ "pkcs5",
+ "pkcs7",
+ "pkcs1v15",
+ "oaep",
+ "raw",
+ "other",
+ "unknown"
+ ],
+ "meta:enum": {
+ "pkcs5": "Public Key Cryptography Standard: Password-Based Cryptography",
+ "pkcs7": "Public Key Cryptography Standard: Cryptographic Message Syntax",
+ "pkcs1v15": "Public Key Cryptography Standard: RSA Cryptography v1.5",
+ "oaep": "Optimal asymmetric encryption padding",
+ "raw": "Raw",
+ "other": "Another padding scheme",
+ "unknown": "The padding scheme is not known"
+ }
+ },
+ "cryptoFunctions": {
+ "type": "array",
+ "title": "Cryptographic functions",
+ "description": "The cryptographic functions implemented by the cryptographic algorithm.",
+ "items": {
+ "type": "string",
+ "enum": [
+ "generate",
+ "keygen",
+ "encrypt",
+ "decrypt",
+ "digest",
+ "tag",
+ "keyderive",
+ "sign",
+ "verify",
+ "encapsulate",
+ "decapsulate",
+ "other",
+ "unknown"
+ ]
+ }
+ },
+ "classicalSecurityLevel": {
+ "type": "integer",
+ "title": "classical security level",
+ "description": "The classical security level that a cryptographic algorithm provides (in bits).",
+ "minimum": 0
+ },
+ "nistQuantumSecurityLevel": {
+ "type": "integer",
+ "title": "NIST security strength category",
+ "description": "The NIST security strength category as defined in https://csrc.nist.gov/projects/post-quantum-cryptography/post-quantum-cryptography-standardization/evaluation-criteria/security-(evaluation-criteria). A value of 0 indicates that none of the categories are met.",
+ "minimum": 0,
+ "maximum": 6
+ }
+ }
+ },
+ "certificateProperties": {
+ "type": "object",
+ "title": "Certificate Properties",
+ "description": "Properties for cryptographic assets of asset type 'certificate'",
+ "additionalProperties": false,
+ "properties": {
+ "subjectName": {
+ "type": "string",
+ "title": "Subject Name",
+ "description": "The subject name for the certificate"
+ },
+ "issuerName": {
+ "type": "string",
+ "title": "Issuer Name",
+ "description": "The issuer name for the certificate"
+ },
+ "notValidBefore": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Not Valid Before",
+ "description": "The date and time according to ISO-8601 standard from which the certificate is valid"
+ },
+ "notValidAfter": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Not Valid After",
+ "description": "The date and time according to ISO-8601 standard from which the certificate is not valid anymore"
+ },
+ "signatureAlgorithmRef": {
+ "$ref": "#/definitions/refType",
+ "title": "Algorithm Reference",
+ "description": "The bom-ref to signature algorithm used by the certificate"
+ },
+ "subjectPublicKeyRef": {
+ "$ref": "#/definitions/refType",
+ "title": "Key reference",
+ "description": "The bom-ref to the public key of the subject"
+ },
+ "certificateFormat": {
+ "type": "string",
+ "title": "Certificate Format",
+ "description": "The format of the certificate",
+ "examples": [
+ "X.509",
+ "PEM",
+ "DER",
+ "CVC"
+ ]
+ },
+ "certificateExtension": {
+ "type": "string",
+ "title": "Certificate File Extension",
+ "description": "The file extension of the certificate",
+ "examples": [
+ "crt",
+ "pem",
+ "cer",
+ "der",
+ "p12"
+ ]
+ }
+ }
+ },
+ "relatedCryptoMaterialProperties": {
+ "type": "object",
+ "title": "Related Cryptographic Material Properties",
+ "description": "Properties for cryptographic assets of asset type: `related-crypto-material`",
+ "additionalProperties": false,
+ "properties": {
+ "type": {
+ "type": "string",
+ "title": "relatedCryptoMaterialType",
+ "description": "The type for the related cryptographic material",
+ "enum": [
+ "private-key",
+ "public-key",
+ "secret-key",
+ "key",
+ "ciphertext",
+ "signature",
+ "digest",
+ "initialization-vector",
+ "nonce",
+ "seed",
+ "salt",
+ "shared-secret",
+ "tag",
+ "additional-data",
+ "password",
+ "credential",
+ "token",
+ "other",
+ "unknown"
+ ],
+ "meta:enum": {
+ "private-key": "The confidential key of a key pair used in asymmetric cryptography.",
+ "public-key": "The non-confidential key of a key pair used in asymmetric cryptography.",
+ "secret-key": "A key used to encrypt and decrypt messages in symmetric cryptography.",
+ "key": "A piece of information, usually an octet string, which, when processed through a cryptographic algorithm, processes cryptographic data.",
+ "ciphertext": "The result of encryption performed on plaintext using an algorithm (or cipher).",
+ "signature": "A cryptographic value that is calculated from the data and a key known only by the signer.",
+ "digest": "The output of the hash function.",
+ "initialization-vector": "A fixed-size random or pseudo-random value used as an input parameter for cryptographic algorithms.",
+ "nonce": "A random or pseudo-random number that can only be used once in a cryptographic communication.",
+ "seed": "The input to a pseudo-random number generator. Different seeds generate different pseudo-random sequences.",
+ "salt": "A value used in a cryptographic process, usually to ensure that the results of computations for one instance cannot be reused by an attacker.",
+ "shared-secret": "A piece of data known only to the parties involved, in a secure communication.",
+ "tag": "A message authentication code (MAC), sometimes known as an authentication tag, is a short piece of information used for authenticating and integrity-checking a message.",
+ "additional-data": "An unspecified collection of data with relevance to cryptographic activity.",
+ "password": "A secret word, phrase, or sequence of characters used during authentication or authorization.",
+ "credential": "Establishes the identity of a party to communication, usually in the form of cryptographic keys or passwords.",
+ "token": "An object encapsulating a security identity.",
+ "other": "Another type of cryptographic asset.",
+ "unknown": "The type of cryptographic asset is not known."
+ }
+ },
+ "id": {
+ "type": "string",
+ "title": "ID",
+ "description": "The optional unique identifier for the related cryptographic material."
+ },
+ "state": {
+ "type": "string",
+ "title": "State",
+ "description": "The key state as defined by NIST SP 800-57.",
+ "enum": [
+ "pre-activation",
+ "active",
+ "suspended",
+ "deactivated",
+ "compromised",
+ "destroyed"
+ ]
+ },
+ "algorithmRef": {
+ "$ref": "#/definitions/refType",
+ "title": "Algorithm Reference",
+ "description": "The bom-ref to the algorithm used to generate the related cryptographic material."
+ },
+ "creationDate": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Creation Date",
+ "description": "The date and time (timestamp) when the related cryptographic material was created."
+ },
+ "activationDate": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Activation Date",
+ "description": "The date and time (timestamp) when the related cryptographic material was activated."
+ },
+ "updateDate": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Update Date",
+ "description": "The date and time (timestamp) when the related cryptographic material was updated."
+ },
+ "expirationDate": {
+ "type": "string",
+ "format": "date-time",
+ "title": "Expiration Date",
+ "description": "The date and time (timestamp) when the related cryptographic material expires."
+ },
+ "value": {
+ "type": "string",
+ "title": "Value",
+ "description": "The associated value of the cryptographic material."
+ },
+ "size": {
+ "type": "integer",
+ "title": "Size",
+ "description": "The size of the cryptographic asset (in bits)."
+ },
+ "format": {
+ "type": "string",
+ "title": "Format",
+ "description": "The format of the related cryptographic material (e.g. P8, PEM, DER)."
+ },
+ "securedBy": {
+ "$ref": "#/definitions/securedBy",
+ "title": "Secured By",
+ "description": "The mechanism by which the cryptographic asset is secured by."
+ }
+ }
+ },
+ "protocolProperties": {
+ "type": "object",
+ "title": "Protocol Properties",
+ "description": "Properties specific to cryptographic assets of type: `protocol`.",
+ "additionalProperties": false,
+ "properties": {
+ "type": {
+ "type": "string",
+ "title": "Type",
+ "description": "The concrete protocol type.",
+ "enum": [
+ "tls",
+ "ssh",
+ "ipsec",
+ "ike",
+ "sstp",
+ "wpa",
+ "other",
+ "unknown"
+ ],
+ "meta:enum": {
+ "tls": "Transport Layer Security",
+ "ssh": "Secure Shell",
+ "ipsec": "Internet Protocol Security",
+ "ike": "Internet Key Exchange",
+ "sstp": "Secure Socket Tunneling Protocol",
+ "wpa": "Wi-Fi Protected Access",
+ "other": "Another protocol type",
+ "unknown": "The protocol type is not known"
+ }
+ },
+ "version": {
+ "type": "string",
+ "title": "Protocol Version",
+ "description": "The version of the protocol.",
+ "examples": [
+ "1.0",
+ "1.2",
+ "1.99"
+ ]
+ },
+ "cipherSuites": {
+ "type": "array",
+ "title": "Cipher Suites",
+ "description": "A list of cipher suites related to the protocol.",
+ "items": {
+ "$ref": "#/definitions/cipherSuite",
+ "title": "Cipher Suite"
+ }
+ },
+ "ikev2TransformTypes": {
+ "type": "object",
+ "title": "IKEv2 Transform Types",
+ "description": "The IKEv2 transform types supported (types 1-4), defined in [RFC 7296 section 3.3.2](https://www.ietf.org/rfc/rfc7296.html#section-3.3.2), and additional properties.",
+ "additionalProperties": false,
+ "properties": {
+ "encr": {
+ "$ref": "#/definitions/cryptoRefArray",
+ "title": "Encryption Algorithm (ENCR)",
+ "description": "Transform Type 1: encryption algorithms"
+ },
+ "prf": {
+ "$ref": "#/definitions/cryptoRefArray",
+ "title": "Pseudorandom Function (PRF)",
+ "description": "Transform Type 2: pseudorandom functions"
+ },
+ "integ": {
+ "$ref": "#/definitions/cryptoRefArray",
+ "title": "Integrity Algorithm (INTEG)",
+ "description": "Transform Type 3: integrity algorithms"
+ },
+ "ke": {
+ "$ref": "#/definitions/cryptoRefArray",
+ "title": "Key Exchange Method (KE)",
+ "description": "Transform Type 4: Key Exchange Method (KE) per [RFC 9370](https://www.ietf.org/rfc/rfc9370.html), formerly called Diffie-Hellman Group (D-H)."
+ },
+ "esn": {
+ "type": "boolean",
+ "title": "Extended Sequence Numbers (ESN)",
+ "description": "Specifies if an Extended Sequence Number (ESN) is used."
+ },
+ "auth": {
+ "$ref": "#/definitions/cryptoRefArray",
+ "title": "IKEv2 Authentication method",
+ "description": "IKEv2 Authentication method"
+ }
+ }
+ },
+ "cryptoRefArray": {
+ "$ref": "#/definitions/cryptoRefArray",
+ "title": "Cryptographic References",
+ "description": "A list of protocol-related cryptographic assets"
+ }
+ }
+ },
+ "oid": {
+ "type": "string",
+ "title": "OID",
+ "description": "The object identifier (OID) of the cryptographic asset."
+ }
+ }
+ },
+ "cipherSuite": {
+ "type": "object",
+ "title": "Cipher Suite",
+ "description": "Object representing a cipher suite",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "type": "string",
+ "title": "Common Name",
+ "description": "A common name for the cipher suite.",
+ "examples": [
+ "TLS_DHE_RSA_WITH_AES_128_CCM"
+ ]
+ },
+ "algorithms": {
+ "type": "array",
+ "title": "Related Algorithms",
+ "description": "A list of algorithms related to the cipher suite.",
+ "items": {
+ "$ref": "#/definitions/refType",
+ "title": "Algorithm reference",
+ "description": "The bom-ref to algorithm cryptographic asset."
+ }
+ },
+ "identifiers": {
+ "type": "array",
+ "title": "Cipher Suite Identifiers",
+ "description": "A list of common identifiers for the cipher suite.",
+ "items": {
+ "type": "string",
+ "title": "identifier",
+ "description": "Cipher suite identifier",
+ "examples": [
+ "0xC0",
+ "0x9E"
+ ]
+ }
+ }
+ }
+ },
+ "cryptoRefArray" : {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/refType"
+ }
+ },
+ "securedBy": {
+ "type": "object",
+ "title": "Secured By",
+ "description": "Specifies the mechanism by which the cryptographic asset is secured by",
+ "additionalProperties": false,
+ "properties": {
+ "mechanism": {
+ "type": "string",
+ "title": "Mechanism",
+ "description": "Specifies the mechanism by which the cryptographic asset is secured by.",
+ "examples": [
+ "HSM",
+ "TPM",
+ "SGX",
+ "Software",
+ "None"
+ ]
+ },
+ "algorithmRef": {
+ "$ref": "#/definitions/refType",
+ "title": "Algorithm Reference",
+ "description": "The bom-ref to the algorithm."
+ }
+ }
+ },
+ "tags": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "title": "Tags",
+ "description": "Textual strings that aid in discovery, search, and retrieval of the associated object. Tags often serve as a way to group or categorize similar or related objects by various attributes.",
+ "examples": [
+ "json-parser",
+ "object-persistence",
+ "text-to-image",
+ "translation",
+ "object-detection"
+ ]
+ }
+ }
+}
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
new file mode 100644
index 00000000..32683406
--- /dev/null
+++ b/schema/bom-1.7.xsd
@@ -0,0 +1,8307 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+CycloneDX Bill of Material (BOM) Specification
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+ xmlns:bom="http://cyclonedx.org/schema/bom/1.7"
+ xmlns:spdx="http://cyclonedx.org/schema/spdx"
+ elementFormDefault="qualified"
+ targetNamespace="http://cyclonedx.org/schema/bom/1.7"
+ vc:minVersion="1.0"
+ vc:maxVersion="1.1"
+ version="1.7.0">
+
+ <xs:import namespace="http://cyclonedx.org/schema/spdx" schemaLocation="http://cyclonedx.org/schema/spdx"/>
+
+ <xs:annotation>
+ <xs:documentation>
+ <name>CycloneDX Bill of Materials Standard</name>
+ <url>https://cyclonedx.org/</url>
+ <license uri="http://www.apache.org/licenses/LICENSE-2.0"
+ version="2.0">Apache License, Version 2.0</license>
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:simpleType name="refType">
+ <xs:annotation>
+ <xs:documentation>Identifier for referable and therefore interlink-able elements.</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ <!-- value SHOULD not start with the BOM-Link intro "urn:cdx:" -->
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="refLinkType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Descriptor for an element identified by the attribute "bom-ref" in the same BOM document.
+ In contrast to `bomLinkElementType`.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="bom:refType"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="versionType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+ A single disjunctive version identifier, for a component or service.
+
+ Example values:
+ - "9.0.14"
+ - "v1.33.7"
+ - "7.0.0-M1"
+ - "2.0pre1"
+ - "1.0.0-beta1"
+ - "0.8.15"
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:normalizedString">
+ <xs:maxLength value="1024"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="versionRangeType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en"><![CDATA[
+ A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst
+
+ Example values:
+ - "vers:cargo/9.0.14"
+ - "vers:npm/1.2.3|>=2.0.0|<5.0.0"
+ - "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
+ - "vers:tomee/>=1.0.0-beta1|<=1.7.5|>=7.0.0-M1|<=7.0.7|>=7.1.0|<=7.1.2|>=8.0.0-M1|<=8.0.1"
+ - "vers:gem/>=2.2.0|!= 2.2.1|<2.3.0"
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:normalizedString">
+ <xs:minLength value="1"/>
+ <xs:maxLength value="4096"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="bomLinkDocumentType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Descriptor for another BOM document.
+ See https://cyclonedx.org/capabilities/bomlink/
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:anyURI">
+ <!-- part of the pattern is based on `bom.serialNumber`'s pattern -->
+ <xs:pattern value="urn:cdx:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/[1-9][0-9]*"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="bomLinkElementType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Descriptor for an element in another BOM document.
+ See https://cyclonedx.org/capabilities/bomlink/
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:anyURI">
+ <!-- part of the pattern is based on `bom.serialNumber`'s pattern -->
+ <xs:pattern value="urn:cdx:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/[1-9][0-9]*#.+"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="bomLinkType">
+ <xs:union memberTypes="bom:bomLinkDocumentType bom:bomLinkElementType"/>
+ </xs:simpleType>
+
+ <xs:complexType name="metadata">
+ <xs:sequence minOccurs="0" maxOccurs="1">
+ <xs:element name="timestamp" type="xs:dateTime" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The date and time (timestamp) when the BOM was created.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="lifecycles" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Lifecycles communicate the stage(s) in which data in the BOM was captured. Different types of data may be available at various phases of a lifecycle, such as the Software Development Lifecycle (SDLC), IT Asset Management (ITAM), and Software Asset Management (SAM). Thus, a BOM may include data specific to or only obtainable in a given lifecycle.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="lifecycle" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:choice>
+ <xs:sequence>
+ <xs:element name="phase" type="bom:lifecyclePhaseType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A pre-defined phase in the product lifecycle.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:sequence>
+ <xs:element name="name" type="xs:normalizedString" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the lifecycle phase
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The description of the lifecycle phase
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="tools" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The tool(s) used in the creation of the BOM.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="tool" minOccurs="0" type="bom:toolType">
+ <xs:annotation>
+ <xs:documentation>DEPRECATED. Use tools\components or tools\services instead.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:sequence minOccurs="0" maxOccurs="1">
+ <xs:element name="components" type="bom:componentsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A list of software and hardware components used as tools.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="services" type="bom:servicesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A list of services used as tools.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="authors" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The person(s) who created the BOM.
+ Authors are common in BOMs created through manual processes. BOMs created through automated means may have './manufacturer' instead.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="author" type="bom:organizationalContact"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="component" type="bom:component" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The component that the BOM describes.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="manufacturer" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The organization that created the BOM.
+ Manufacturer is common in BOMs created through automated processes. BOMs created through manual means may have './authors' instead.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="manufacture" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ DEPRECATED - DO NOT USE. This will be removed in a future version. Use the `./component/manufacturer` instead.
+ The organization that manufactured the component that the BOM describes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="supplier" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The organization that supplied the component that the BOM describes. The
+ supplier may often be the manufacturer, but may also be a distributor or repackager.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The license information for the BOM document.
+ This may be different from the license(s) of the component(s) that the BOM describes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:simpleType name="lifecyclePhaseType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="design">
+ <xs:annotation>
+ <xs:documentation>
+ BOM produced early in the development lifecycle containing inventory of components and services
+ that are proposed or planned to be used. The inventory may need to be procured, retrieved,
+ or resourced prior to use.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="pre-build">
+ <xs:annotation>
+ <xs:documentation>
+ BOM consisting of information obtained prior to a build process and may contain source files
+ and development artifacts and manifests. The inventory may need to be resolved and retrieved
+ prior to use.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="build">
+ <xs:annotation>
+ <xs:documentation>
+ BOM consisting of information obtained during a build process where component inventory is
+ available for use. The precise versions of resolved components are usually available at this
+ time as well as the provenance of where the components were retrieved from.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="post-build">
+ <xs:annotation>
+ <xs:documentation>
+ BOM consisting of information obtained after a build process has completed and the resulting
+ components(s) are available for further analysis. Built components may exist as the result of a
+ CI/CD process, may have been installed or deployed to a system or device, and may need to be
+ retrieved or extracted from the system or device.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="operations">
+ <xs:annotation>
+ <xs:documentation>
+ BOM produced that represents inventory that is running and operational. This may include staging
+ or production environments and will generally encompass multiple SBOMs describing the applications
+ and operating system, along with HBOMs describing the hardware that makes up the system. Operations
+ Bill of Materials (OBOM) can provide full-stack inventory of runtime environments, configurations,
+ and additional dependencies.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="discovery">
+ <xs:annotation>
+ <xs:documentation>
+ BOM consisting of information observed through network discovery providing point-in-time
+ enumeration of embedded, on-premise, and cloud-native services such as server applications,
+ connected devices, microservices, and serverless functions.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="decommission">
+ <xs:annotation>
+ <xs:documentation>
+ BOM containing inventory that will be, or has been retired from operations.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="organizationalEntity">
+ <xs:sequence minOccurs="0" maxOccurs="1">
+ <xs:element name="name" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The name of the organization</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="address" type="bom:postalAddressType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The physical address (location) of the organization.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="url" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The URL of the organization. Multiple URLs are allowed.
+ Example: https://example.com
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="contact" type="bom:organizationalContact" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>A contact person at the organization. Multiple contacts are allowed.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the object elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="toolType">
+ <xs:annotation>
+ <xs:documentation>Information about the automated or manual tool used</xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0" maxOccurs="1">
+ <xs:element name="vendor" minOccurs="0" maxOccurs="1" type="xs:normalizedString">
+ <xs:annotation>
+ <xs:documentation>The name of the vendor who created the tool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:normalizedString">
+ <xs:annotation>
+ <xs:documentation>The name of the tool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="version" minOccurs="0" maxOccurs="1" type="bom:versionType">
+ <xs:annotation>
+ <xs:documentation>The version of the tool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="hashes" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="hash" type="bom:hashType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="externalReferences" type="bom:externalReferences" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document external references related to the tool.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="organizationalContact">
+ <xs:sequence minOccurs="0" maxOccurs="1">
+ <xs:element name="name" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The name of the contact</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="email" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The email address of the contact.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="phone" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The phone number of the contact.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the object elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="componentsType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="component" type="bom:component"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="component">
+ <xs:sequence>
+ <xs:element name="supplier" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The organization that supplied the component. The supplier may often
+ be the manufacturer, but may also be a distributor or repackager.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="manufacturer" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The organization that created the component.
+ Manufacturer is common in components created through automated processes. Components created through manual means may have './authors' instead.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="authors" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The person(s) who created the component.
+ Authors are common in components created through manual processes. Components created through automated means may have `./manufacturer` instead.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="author" type="bom:organizationalContact"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="author" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ DEPRECATED - DO NOT USE. This will be removed in a future version. Use `./authors` or `./manufacturer` instead.
+ The person(s) or organization(s) that authored the component.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="publisher" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The person(s) or organization(s) that published the component</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="group" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The grouping name or identifier. This will often be a shortened, single
+ name of the company or project that produced the component, or the source package or
+ domain name. Whitespace and special characters should be avoided. Examples include:
+ apache, org.apache.commons, and apache.org.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" type="xs:normalizedString" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The name of the component. This will often be a shortened, single name
+ of the component. Examples: commons-lang3 and jquery</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="version" type="bom:versionType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The component version. The version should ideally comply with semantic versioning
+ but is not enforced.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Specifies a description for the component</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="scope" type="bom:scope" minOccurs="0" maxOccurs="1" default="required">
+ <xs:annotation>
+ <xs:documentation>Specifies the scope of the component. If scope is not specified, 'required'
+ scope SHOULD be assumed by the consumer of the BOM.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="hashes" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="hash" type="bom:hashType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="copyright" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A copyright notice informing users of the underlying claims to
+ copyright ownership in a published work.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="cpe" type="bom:cpe" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies a well-formed CPE name that conforms to the CPE 2.2 or 2.3 specification. See https://nvd.nist.gov/products/cpe
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="purl" type="xs:anyURI" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the package-url (purl). The purl, if specified, MUST be valid and conform
+ to the specification defined at: https://github.com/package-url/purl-spec
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="omniborId" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, MUST be valid and conform
+ to the specification defined at: https://www.iana.org/assignments/uri-schemes/prov/gitoid
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="swhid" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the Software Heritage persistent identifier (SWHID). The SWHID, if specified, MUST
+ be valid and conform to the specification defined at:
+ https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="swid" type="bom:swidType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies metadata and content for ISO-IEC 19770-2 Software Identification (SWID) Tags.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="modified" type="xs:boolean" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ DEPRECATED - DO NOT USE. This will be removed in a future version. Use the pedigree
+ element instead to supply information on exactly how the component was modified.
+ A boolean value indicating if the component has been modified from the original.
+ A value of true indicates the component is a derivative of the original.
+ A value of false indicates the component has not been modified from the original.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="pedigree" type="bom:pedigreeType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Component pedigree is a way to document complex supply chain scenarios where components are
+ created, distributed, modified, redistributed, combined with other components, etc.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="externalReferences" type="bom:externalReferences" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document external references related to the
+ component or to the project the component describes.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="components" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A list of software and hardware components included in the parent component. This is not a
+ dependency tree. It provides a way to specify a hierarchical representation of component
+ assemblies, similar to system -> subsystem -> parts assembly in physical supply chains.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="component" type="bom:component"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="evidence" type="bom:componentEvidenceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document evidence collected through various forms of extraction or analysis.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="releaseNotes" type="bom:releaseNotesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Specifies optional release notes.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="modelCard" type="bom:modelCardType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A model card describes the intended uses of a machine learning model and potential
+ limitations, including biases and ethical considerations. Model cards typically contain the
+ training parameters, which datasets were used to train the model, performance metrics, and other
+ relevant data useful for ML transparency. This object SHOULD be specified for any component of
+ type `machine-learning-model` and MUST NOT be specified for other component types.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="data" type="bom:componentDataType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>This object SHOULD be specified for any component of type `data` and MUST NOT be
+ specified for other component types.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="cryptoProperties" type="bom:cryptoPropertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Cryptographic assets have properties that uniquely define them and that make them actionable
+ for further reasoning. As an example, it makes a difference if one knows the algorithm family
+ (e.g. AES) or the specific variant or instantiation (e.g. AES-128-GCM). This is because the
+ security level and the algorithm primitive (authenticated encryption) is only defined by the
+ definition of the algorithm variant. The presence of a weak cryptographic algorithm like SHA1
+ vs. HMAC-SHA1 also makes a difference.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="tags" type="bom:tagsType" minOccurs="0" maxOccurs="1" />
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="type" type="bom:classification" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the type of component. For software components, classify as application if no more
+ specific appropriate classification is available or cannot be determined for the component.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="mime-type" type="bom:mimeType">
+ <xs:annotation>
+ <xs:documentation>
+ The OPTIONAL mime-type of the component. When used on file components, the mime-type
+ can provide additional context about the kind of file being represented such as an image,
+ font, or executable. Some library or framework components may also have an associated mime-type.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the component elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="licenseType">
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="id" type="spdx:licenseId" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A valid SPDX license ID</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" type="xs:normalizedString" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>If SPDX does not define the license used, this field may be used to provide the license name</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ <xs:element name="text" type="bom:attachedTextType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Specifies the optional full text of the attachment</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="url" type="xs:anyURI" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The URL to the attachment file. If the attachment is a license or BOM,
+ an externalReference should also be specified for completeness.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="licensing" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Licensing details describing the licensor/licensee, license type, renewal and
+ expiration dates, and other important metadata</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="altIds" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>License identifiers that may be used to manage licenses and
+ their lifecycle</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="altId" type="xs:normalizedString" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="licensor" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The individual or organization that grants a license to another
+ individual or organization</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="organization" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The organization that granted the license</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="individual" type="bom:organizationalContact" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The individual, not associated with an organization,
+ that granted the license</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="licensee" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The individual or organization for which a license was granted to</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="organization" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The organization that was granted the license</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="individual" type="bom:organizationalContact" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The individual, not associated with an organization,
+ that was granted the license</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="purchaser" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The individual or organization that purchased the license</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="organization" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The organization that purchased the license</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="individual" type="bom:organizationalContact" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The individual, not associated with an organization,
+ that purchased the license</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="purchaseOrder" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The purchase order identifier the purchaser sent to a supplier or
+ vendor to authorize a purchase</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="licenseTypes" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The type of license(s) that was granted to the licensee</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="licenseType" type="bom:licenseTypeEnum" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="lastRenewal" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The timestamp indicating when the license was last
+ renewed. For new purchases, this is often the purchase or acquisition date.
+ For non-perpetual licenses or subscriptions, this is the timestamp of when the
+ license was last renewed.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="expiration" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The timestamp indicating when the current license
+ expires (if applicable).</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the license elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="acknowledgement" type="bom:licenseAcknowledgementEnumerationType">
+ <xs:annotation>
+ <xs:documentation>
+ Declared licenses and concluded licenses represent two different stages in the
+ licensing process within software development. Declared licenses refer to the
+ initial intention of the software authors regarding the licensing terms under
+ which their code is released. On the other hand, concluded licenses are the
+ result of a comprehensive analysis of the project's codebase to identify and
+ confirm the actual licenses of the components used, which may differ from the
+ initially declared licenses. While declared licenses provide an upfront indication
+ of the licensing intentions, concluded licenses offer a more thorough understanding
+ of the actual licensing within a project, facilitating proper compliance and risk
+ management. Observed licenses are defined in `evidence.licenses`. Observed licenses
+ form the evidence necessary to substantiate a concluded license.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="attachedTextType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:annotation>
+ <xs:documentation>The attachment data. Proactive controls such as input validation and sanitization should be employed to prevent misuse of attachment text.</xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="content-type" type="xs:normalizedString" default="text/plain">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the format and nature of the data being attached, helping systems correctly
+ interpret and process the content. Common content type examples include `application/json`
+ for JSON data and `text/plain` for plan text documents.
+
+ RFC 2045 section 5.1 outlines the structure and use of content types. For a comprehensive
+ list of registered content types, refer to the IANA media types registry at
+ https://www.iana.org/assignments/media-types/media-types.xhtml.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="encoding" type="bom:encoding">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the optional encoding the text is represented in
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:complexType name="hashType">
+ <xs:annotation>
+ <xs:documentation>Specifies the file hash of the component</xs:documentation>
+ </xs:annotation>
+ <xs:simpleContent>
+ <xs:extension base="bom:hashValue">
+ <xs:attribute name="alg" type="bom:hashAlg" use="required">
+ <xs:annotation>
+ <xs:documentation>Specifies the algorithm used to create the hash</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:simpleType name="scope">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="required">
+ <xs:annotation>
+ <xs:documentation>The component is required for runtime</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="optional">
+ <xs:annotation>
+ <xs:documentation>The component is optional at runtime. Optional components are components that
+ are not capable of being called due to them not be installed or otherwise accessible by any means.
+ Components that are installed but due to configuration or other restrictions are prohibited from
+ being called must be scoped as 'required'.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="excluded">
+ <xs:annotation>
+ <xs:documentation>Components that are excluded provide the ability to document component usage
+ for test and other non-runtime purposes. Excluded components are not reachable within a call
+ graph at runtime.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="classification">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="application">
+ <xs:annotation>
+ <xs:documentation>A software application. Refer to https://en.wikipedia.org/wiki/Application_software
+ for information about applications.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="framework">
+ <xs:annotation>
+ <xs:documentation>A software framework. Refer to https://en.wikipedia.org/wiki/Software_framework
+ for information on how frameworks vary slightly from libraries.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="library">
+ <xs:annotation>
+ <xs:documentation>A software library. Refer to https://en.wikipedia.org/wiki/Library_(computing)
+ for information about libraries. All third-party and open source reusable components will likely
+ be a library. If the library also has key features of a framework, then it should be classified
+ as a framework. If not, or is unknown, then specifying library is recommended.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="container">
+ <xs:annotation>
+ <xs:documentation>A packaging and/or runtime format, not specific to any particular technology,
+ which isolates software inside the container from software outside of a container through
+ virtualization technology. Refer to https://en.wikipedia.org/wiki/OS-level_virtualization</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="platform">
+ <xs:annotation>
+ <xs:documentation>A runtime environment which interprets or executes software. This may include
+ runtimes such as those that execute bytecode or low-code/no-code application platforms.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="operating-system">
+ <xs:annotation>
+ <xs:documentation>A software operating system without regard to deployment model
+ (i.e. installed on physical hardware, virtual machine, image, etc) Refer to
+ https://en.wikipedia.org/wiki/Operating_system</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="device">
+ <xs:annotation>
+ <xs:documentation>A hardware device such as a processor, or chip-set. A hardware device
+ containing firmware SHOULD include a component for the physical hardware itself, and another
+ component of type 'firmware' or 'operating-system' (whichever is relevant), describing
+ information about the software running on the device.
+ See also the list of known device properties: https://github.com/CycloneDX/cyclonedx-property-taxonomy/blob/main/cdx/device.md
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="device-driver">
+ <xs:annotation>
+ <xs:documentation>A special type of software that operates or controls a particular type of device.
+ Refer to https://en.wikipedia.org/wiki/Device_driver</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="firmware">
+ <xs:annotation>
+ <xs:documentation>A special type of software that provides low-level control over a devices
+ hardware. Refer to https://en.wikipedia.org/wiki/Firmware</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="file">
+ <xs:annotation>
+ <xs:documentation>A computer file. Refer to https://en.wikipedia.org/wiki/Computer_file
+ for information about files.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="machine-learning-model">
+ <xs:annotation>
+ <xs:documentation>A model based on training data that can make predictions or decisions without
+ being explicitly programmed to do so.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="data">
+ <xs:annotation>
+ <xs:documentation>A collection of discrete values that convey information.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cryptographic-asset">
+ <xs:annotation>
+ <xs:documentation>A cryptographic asset including algorithms, protocols, certificates, keys, tokens, and secrets.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="hashAlg">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="MD5"/>
+ <xs:enumeration value="SHA-1"/>
+ <xs:enumeration value="SHA-256"/>
+ <xs:enumeration value="SHA-384"/>
+ <xs:enumeration value="SHA-512"/>
+ <xs:enumeration value="SHA3-256"/>
+ <xs:enumeration value="SHA3-384"/>
+ <xs:enumeration value="SHA3-512"/>
+ <xs:enumeration value="BLAKE2b-256"/>
+ <xs:enumeration value="BLAKE2b-384"/>
+ <xs:enumeration value="BLAKE2b-512"/>
+ <xs:enumeration value="BLAKE3"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="licenseTypeEnum">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="academic">
+ <xs:annotation>
+ <xs:documentation>A license that grants use of software solely for the purpose
+ of education or research.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="appliance">
+ <xs:annotation>
+ <xs:documentation>A license covering use of software embedded in a specific
+ piece of hardware.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="client-access">
+ <xs:annotation>
+ <xs:documentation>A Client Access License (CAL) allows client computers to access
+ services provided by server software.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="concurrent-user">
+ <xs:annotation>
+ <xs:documentation>A Concurrent User license (aka floating license) limits the
+ number of licenses for a software application and licenses are shared among
+ a larger number of users.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="core-points">
+ <xs:annotation>
+ <xs:documentation>A license where the core of a computer's processor is assigned
+ a specific number of points.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="custom-metric">
+ <xs:annotation>
+ <xs:documentation>A license for which consumption is measured by non-standard
+ metrics.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="device">
+ <xs:annotation>
+ <xs:documentation>A license that covers a defined number of installations on
+ computers and other types of devices.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="evaluation">
+ <xs:annotation>
+ <xs:documentation>A license that grants permission to install and use software
+ for trial purposes.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="named-user">
+ <xs:annotation>
+ <xs:documentation>A license that grants access to the software to one or more
+ pre-defined users.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="node-locked">
+ <xs:annotation>
+ <xs:documentation>A license that grants access to the software on one or more
+ pre-defined computers or devices.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="oem">
+ <xs:annotation>
+ <xs:documentation>An Original Equipment Manufacturer license that is delivered
+ with hardware, cannot be transferred to other hardware, and is valid for the
+ life of the hardware.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="perpetual">
+ <xs:annotation>
+ <xs:documentation>A license where the software is sold on a one-time basis and
+ the licensee can use a copy of the software indefinitely.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="processor-points">
+ <xs:annotation>
+ <xs:documentation>A license where each installation consumes points per
+ processor.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="subscription">
+ <xs:annotation>
+ <xs:documentation>A license where the licensee pays a fee to use the software
+ or service.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="user">
+ <xs:annotation>
+ <xs:documentation>A license that grants access to the software or service by a
+ specified number of users.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>Another license type.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="hashValue">
+ <xs:restriction base="xs:token">
+ <xs:pattern value="([a-fA-F0-9]{32})|([a-fA-F0-9]{40})|([a-fA-F0-9]{64})|([a-fA-F0-9]{96})|([a-fA-F0-9]{128})"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="mimeType">
+ <xs:restriction base="xs:token">
+ <xs:pattern value="[-+a-z0-9.]+/[-+a-z0-9.]+"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="encoding">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="base64"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="cpe">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Define the format for acceptable CPE URIs. Supports CPE 2.2 and CPE 2.3 formats.
+ Refer to https://nvd.nist.gov/products/cpe for official specification.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="([c][pP][eE]:/[AHOaho]?(:[A-Za-z0-9\._\-~%]*){0,6})|(cpe:2\.3:[aho\*\-](:(((\?*|\*?)([a-zA-Z0-9\-\._]|(\\[\\\*\?!"#$$%&'\(\)\+,/:;<=>@\[\]\^`\{\|}~]))+(\?*|\*?))|[\*\-])){5}(:(([a-zA-Z]{2,3}(-([a-zA-Z]{2}|[0-9]{3}))?)|[\*\-]))(:(((\?*|\*?)([a-zA-Z0-9\-\._]|(\\[\\\*\?!"#$$%&'\(\)\+,/:;<=>@\[\]\^`\{\|}~]))+(\?*|\*?))|[\*\-])){4})"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="swidType">
+ <xs:sequence>
+ <xs:element name="text" type="bom:attachedTextType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Specifies the full content of the SWID tag.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="url" type="xs:anyURI" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The URL to the SWID file.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="tagId" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>Maps to the tagId of a SoftwareIdentity.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="name" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>Maps to the name of a SoftwareIdentity.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="version" type="xs:string" use="optional" default="0.0">
+ <xs:annotation>
+ <xs:documentation>Maps to the version of a SoftwareIdentity.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="tagVersion" type="xs:integer" use="optional" default="0">
+ <xs:annotation>
+ <xs:documentation>Maps to the tagVersion of a SoftwareIdentity.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="patch" type="xs:boolean" use="optional" default="false">
+ <xs:annotation>
+ <xs:documentation>Maps to the patch of a SoftwareIdentity.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:simpleType name="urnUuid">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Defines a string representation of a UUID conforming to RFC 4122.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="urn:uuid:([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})|(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\})"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="externalReferenceType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="vcs">
+ <xs:annotation>
+ <xs:documentation>Version Control System</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="issue-tracker">
+ <xs:annotation>
+ <xs:documentation>Issue or defect tracking system, or an Application Lifecycle Management (ALM) system</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="website">
+ <xs:annotation>
+ <xs:documentation>Website</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="advisories">
+ <xs:annotation>
+ <xs:documentation>Security advisories</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="bom">
+ <xs:annotation>
+ <xs:documentation>Bill-of-materials (SBOM, OBOM, HBOM, SaaSBOM, etc)</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="mailing-list">
+ <xs:annotation>
+ <xs:documentation>Mailing list or discussion group</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="social">
+ <xs:annotation>
+ <xs:documentation>Social media account</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="chat">
+ <xs:annotation>
+ <xs:documentation>Real-time chat platform</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="documentation">
+ <xs:annotation>
+ <xs:documentation>Documentation, guides, or how-to instructions</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="support">
+ <xs:annotation>
+ <xs:documentation>Community or commercial support</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="source-distribution">
+ <xs:annotation>
+ <xs:documentation>The location where the source code distributable can be obtained. This is often an archive format such as zip or tgz. The source-distribution type complements use of the version control (vcs) type.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="distribution">
+ <xs:annotation>
+ <xs:documentation>Direct or repository download location</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="distribution-intake">
+ <xs:annotation>
+ <xs:documentation>The location where a component was published to. This is often the same as "distribution" but may also include specialized publishing processes that act as an intermediary</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="license">
+ <xs:annotation>
+ <xs:documentation>
+ The URL to the license file. If a license URL has been defined in the license
+ node, it should also be defined as an external reference for completeness.
+ Example: https://www.apache.org/licenses/LICENSE-2.0.txt
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="build-meta">
+ <xs:annotation>
+ <xs:documentation>Build-system specific meta file (i.e. pom.xml, package.json, .nuspec, etc)</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="build-system">
+ <xs:annotation>
+ <xs:documentation>URL to an automated build system</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="release-notes">
+ <xs:annotation>
+ <xs:documentation>URL to release notes</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="security-contact">
+ <xs:annotation>
+ <xs:documentation>Specifies a way to contact the maintainer, supplier, or provider in the event of a security incident. Common URIs include links to a disclosure procedure, a mailto (RFC-2368) that specifies an email address, a tel (RFC-3966) that specifies a phone number, or dns (RFC-4501) that specifies the records containing DNS Security TXT.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="model-card">
+ <xs:annotation>
+ <xs:documentation>A model card describes the intended uses of a machine learning model, potential
+ limitations, biases, ethical considerations, training parameters, datasets used to train the
+ model, performance metrics, and other relevant data useful for ML transparency.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="log">
+ <xs:annotation>
+ <xs:documentation>A record of events that occurred in a computer system or application, such as problems, errors, or information on current operations.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="configuration">
+ <xs:annotation>
+ <xs:documentation>Parameters or settings that may be used by other components or services.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="evidence">
+ <xs:annotation>
+ <xs:documentation>Information used to substantiate a claim.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="formulation">
+ <xs:annotation>
+ <xs:documentation>Describes how a component or service was manufactured or deployed.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="attestation">
+ <xs:annotation>
+ <xs:documentation>Human or machine-readable statements containing facts, evidence, or testimony</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="threat-model">
+ <xs:annotation>
+ <xs:documentation>An enumeration of identified weaknesses, threats, and countermeasures, dataflow diagram (DFD), attack tree, and other supporting documentation in human-readable or machine-readable format</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="adversary-model">
+ <xs:annotation>
+ <xs:documentation>The defined assumptions, goals, and capabilities of an adversary.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="risk-assessment">
+ <xs:annotation>
+ <xs:documentation>Identifies and analyzes the potential of future events that may negatively impact individuals, assets, and/or the environment. Risk assessments may also include judgments on the tolerability of each risk.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="vulnerability-assertion">
+ <xs:annotation>
+ <xs:documentation>A Vulnerability Disclosure Report (VDR) which asserts the known and previously unknown vulnerabilities that affect a component, service, or product including the analysis and findings describing the impact (or lack of impact) that the reported vulnerability has on a component, service, or product.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="exploitability-statement">
+ <xs:annotation>
+ <xs:documentation>A Vulnerability Exploitability eXchange (VEX) which asserts the known vulnerabilities that do not affect a product, product family, or organization, and optionally the ones that do. The VEX should include the analysis and findings describing the impact (or lack of impact) that the reported vulnerability has on the product, product family, or organization.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="pentest-report">
+ <xs:annotation>
+ <xs:documentation>Results from an authorized simulated cyberattack on a component or service, otherwise known as a penetration test</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="static-analysis-report">
+ <xs:annotation>
+ <xs:documentation>SARIF or proprietary machine or human-readable report for which static analysis has identified code quality, security, and other potential issues with the source code</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="dynamic-analysis-report">
+ <xs:annotation>
+ <xs:documentation>Dynamic analysis report that has identified issues such as vulnerabilities and misconfigurations</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="runtime-analysis-report">
+ <xs:annotation>
+ <xs:documentation>Report generated by analyzing the call stack of a running application</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="component-analysis-report">
+ <xs:annotation>
+ <xs:documentation>Report generated by Software Composition Analysis (SCA), container analysis, or other forms of component analysis</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="maturity-report">
+ <xs:annotation>
+ <xs:documentation>Report containing a formal assessment of an organization, business unit, or team against a maturity model</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="certification-report">
+ <xs:annotation>
+ <xs:documentation>Industry, regulatory, or other certification from an accredited (if applicable) certification body</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="quality-metrics">
+ <xs:annotation>
+ <xs:documentation>Report or system in which quality metrics can be obtained</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="codified-infrastructure">
+ <xs:annotation>
+ <xs:documentation>Code or configuration that defines and provisions virtualized infrastructure, commonly referred to as Infrastructure as Code (IaC)</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="poam">
+ <xs:annotation>
+ <xs:documentation>Plans of Action and Milestones (POAM) complement an "attestation" external reference. POAM is defined by NIST as a "document that identifies tasks needing to be accomplished. It details resources required to accomplish the elements of the plan, any milestones in meeting the tasks and scheduled completion dates for the milestones".</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="electronic-signature">
+ <xs:annotation>
+ <xs:documentation>An e-signature is commonly a scanned representation of a written signature or a stylized script of the persons name.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="digital-signature">
+ <xs:annotation>
+ <xs:documentation>A signature that leverages cryptography, typically public/private key pairs, which provides strong authenticity verification.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="rfc-9116">
+ <xs:annotation>
+ <xs:documentation>Document that complies with RFC-9116 (A File Format to Aid in Security Vulnerability Disclosure)</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>Use this if no other types accurately describe the purpose of the external reference</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="externalReferences">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ External references provide a way to document systems, sites, and information that may be
+ relevant, but are not included with the BOM. They may also establish specific relationships
+ within or external to the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="reference" type="bom:externalReference">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Zero or more external references can be defined</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="externalReference">
+ <xs:sequence>
+ <xs:element name="url" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The URI (URL or URN) to the external reference. External references
+ are URIs and therefore can accept any URL scheme including https, mailto, tel, and dns.
+ External references may also include formally registered URNs such as CycloneDX BOM-Link to
+ reference CycloneDX BOMs or any object within a BOM. BOM-Link transforms applicable external
+ references into relationships that can be expressed in a BOM or across BOMs. Refer to:
+ https://cyclonedx.org/capabilities/bomlink/</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:union memberTypes="xs:anyURI bom:bomLinkType"/>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="comment" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">An optional comment describing the external reference</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="hashes" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="hash" type="bom:hashType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="type" type="bom:externalReferenceType" use="required">
+ <xs:annotation>
+ <xs:documentation>Specifies the type of external reference. There are built-in types to describe common
+ references. If a type does not exist for the reference being referred to, use the "other" type.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="commitsType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Zero or more commits can be specified.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="commit" type="bom:commitType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Specifies an individual commit.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="commitType">
+ <xs:sequence>
+ <xs:element name="uid" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">A unique identifier of the commit. This may be version control
+ specific. For example, Subversion uses revision numbers whereas git uses commit hashes.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="url" type="xs:anyURI" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The URL to the commit. This URL will typically point to a commit
+ in a version control system.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="author" type="bom:identifiableActionType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The author who created the changes in the commit</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="committer" type="bom:identifiableActionType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The person who committed or pushed the commit</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="message" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The text description of the contents of the commit</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="patchesType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Zero or more patches can be specified.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="patch" type="bom:patchType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Specifies an individual patch.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="patchType">
+ <xs:sequence>
+ <xs:element name="diff" type="bom:diffType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The patch file (or diff) that show changes.
+ Refer to https://en.wikipedia.org/wiki/Diff</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="resolves" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="issue" type="bom:issueType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="type" type="bom:patchClassification" use="required">
+ <xs:annotation>
+ <xs:documentation>Specifies the purpose for the patch including the resolution of defects,
+ security issues, or new behavior or functionality</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:simpleType name="patchClassification">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="unofficial">
+ <xs:annotation>
+ <xs:documentation>A patch which is not developed by the creators or maintainers of the software
+ being patched. Refer to https://en.wikipedia.org/wiki/Unofficial_patch</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="monkey">
+ <xs:annotation>
+ <xs:documentation>A patch which dynamically modifies runtime behavior.
+ Refer to https://en.wikipedia.org/wiki/Monkey_patch</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="backport">
+ <xs:annotation>
+ <xs:documentation>A patch which takes code from a newer version of software and applies
+ it to older versions of the same software. Refer to https://en.wikipedia.org/wiki/Backporting</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cherry-pick">
+ <xs:annotation>
+ <xs:documentation>A patch created by selectively applying commits from other versions or
+ branches of the same software.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="issueClassification">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="defect">
+ <xs:annotation>
+ <xs:documentation>A fault, flaw, or bug in software</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="enhancement">
+ <xs:annotation>
+ <xs:documentation>A new feature or behavior in software</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="security">
+ <xs:annotation>
+ <xs:documentation>A special type of defect which impacts security</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="diffType">
+ <xs:sequence>
+ <xs:element name="text" type="bom:attachedTextType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Specifies the optional text of the diff</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="url" type="xs:anyURI" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Specifies the URL to the diff</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="issueType">
+ <xs:annotation>
+ <xs:documentation>
+ An individual issue that has been resolved.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="id" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The identifier of the issue assigned by the source of the issue</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The name of the issue</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">A description of the issue</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="source" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ The source of the issue where it is documented.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="name" minOccurs="0" type="xs:normalizedString" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ The name of the source. For example "National Vulnerability Database",
+ "NVD", and "Apache"
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="url" minOccurs="0" type="xs:anyURI" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ The url of the issue documentation as provided by the source
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="references" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="url" type="xs:anyURI"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="type" type="bom:issueClassification" use="required">
+ <xs:annotation>
+ <xs:documentation>Specifies the type of issue</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="identifiableActionType">
+ <xs:sequence>
+ <xs:element name="timestamp" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The timestamp in which the action occurred</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The name of the individual who performed the action</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="email" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">The email address of the individual who performed the action</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="pedigreeType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Component pedigree is a way to document complex supply chain scenarios where components are created,
+ distributed, modified, redistributed, combined with other components, etc. Pedigree supports viewing
+ this complex chain from the beginning, the end, or anywhere in the middle. It also provides a way to
+ document variants where the exact relation may not be known.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="ancestors" type="bom:componentsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Describes zero or more components in which a component is derived
+ from. This is commonly used to describe forks from existing projects where the forked version
+ contains a ancestor node containing the original component it was forked from. For example,
+ Component A is the original component. Component B is the component being used and documented
+ in the BOM. However, Component B contains a pedigree node with a single ancestor documenting
+ Component A - the original component from which Component B is derived from.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="descendants" type="bom:componentsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Descendants are the exact opposite of ancestors. This provides a
+ way to document all forks (and their forks) of an original or root component.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="variants" type="bom:componentsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Variants describe relations where the relationship between the
+ components are not known. For example, if Component A contains nearly identical code to
+ Component B. They are both related, but it is unclear if one is derived from the other,
+ or if they share a common ancestor.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="commits" type="bom:commitsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">A list of zero or more commits which provide a trail describing
+ how the component deviates from an ancestor, descendant, or variant.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="patches" type="bom:patchesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">A list of zero or more patches describing how the component
+ deviates from an ancestor, descendant, or variant. Patches may be complementary to commits
+ or may be used in place of commits.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="notes" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">Notes, observations, and other non-structured commentary
+ describing the components pedigree.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="dependencyType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="dependency" type="bom:dependencyType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The component or service that is a dependency of this dependency object.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="provides" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ The component or service that define a given specification or standard, which is provided or implemented by this dependency object.
+ For example, a cryptographic library which implements a cryptographic algorithm. A component which implements another component does not imply that the implementation is in use.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="ref" type="bom:refLinkType" use="required">
+ <xs:annotation>
+ <xs:documentation>References a component or service by its bom-ref attribute</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="ref" type="bom:refLinkType" use="required">
+ <xs:annotation>
+ <xs:documentation>References a component or service by its bom-ref attribute</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="dependenciesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="dependency" type="bom:dependencyType">
+ <xs:annotation>
+ <xs:documentation>Defines the direct dependencies of a component or service. Components or services
+ that do not have their own dependencies MUST be declared as empty elements within the graph.
+ Components or services that are not represented in the dependency graph MAY have unknown
+ dependencies. It is RECOMMENDED that implementations assume this to be opaque and not an
+ indicator of a object being dependency-free. It is RECOMMENDED to leverage compositions to
+ indicate unknown dependency graphs.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="servicesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="service" type="bom:service"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="service">
+ <xs:sequence>
+ <xs:element name="provider" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The organization that provides the service.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="group" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The grouping name, namespace, or identifier. This will often be a shortened,
+ single name of the company or project that produced the service or domain name.
+ Whitespace and special characters should be avoided.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" type="xs:normalizedString" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The name of the service. This will often be a shortened, single name
+ of the service.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="version" type="bom:versionType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The service version.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Specifies a description for the service.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="endpoints" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="endpoint" type="xs:anyURI" minOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A service endpoint URI.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="authenticated" type="xs:boolean" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A boolean value indicating if the service requires authentication.
+ A value of true indicates the service requires authentication prior to use.
+ A value of false indicates the service does not require authentication.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="x-trust-boundary" type="xs:boolean" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A boolean value indicating if use of the service crosses a trust zone or boundary.
+ A value of true indicates that by using the service, a trust boundary is crossed.
+ A value of false indicates that by using the service, a trust boundary is not crossed.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="trustZone" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The name of the trust zone the service resides in.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="data" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:choice>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="classification" type="bom:dataClassificationType">
+ <xs:annotation>
+ <xs:documentation>DEPRECATED: Specifies the data classification. THIS FIELD IS DEPRECATED AS OF v1.5. Use dataflow\classification instead</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:element name="dataflow" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>Specifies the data classification.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="classification" type="bom:dataClassificationType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Specifies the data classification.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="governance" type="bom:dataGovernance" minOccurs="0" maxOccurs="1" />
+ <xs:element name="source" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The URI, URL, or BOM-Link of the components or services the data came in from.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="url">
+ <xs:simpleType>
+ <xs:union memberTypes="xs:anyURI bom:bomLinkElementType"/>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="destination" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The URI, URL, or BOM-Link of the components or services the data is sent to.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="url">
+ <xs:simpleType>
+ <xs:union memberTypes="xs:anyURI bom:bomLinkElementType"/>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Name for the defined data.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Short description of the data content and usage.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="externalReferences" type="bom:externalReferences" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document external references related to the service.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="services" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A list of services included or deployed behind the parent service. This is not a dependency
+ tree. It provides a way to specify a hierarchical representation of service assemblies.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="service" type="bom:service"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="releaseNotes" type="bom:releaseNotesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Specifies optional release notes.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="tags" type="bom:tagsType" minOccurs="0" maxOccurs="1" />
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the service elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="dataClassificationType">
+ <xs:annotation>
+ <xs:documentation>Specifies the data classification.</xs:documentation>
+ </xs:annotation>
+ <xs:simpleContent>
+ <xs:extension base="xs:normalizedString">
+ <xs:attribute name="flow" type="bom:dataFlowType" use="required">
+ <xs:annotation>
+ <xs:documentation>Specifies the flow direction of the data.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:simpleType name="dataFlowType">
+ <xs:annotation>
+ <xs:documentation>Specifies the flow direction of the data. Valid values are:
+ inbound, outbound, bi-directional, and unknown. Direction is relative to the service.
+ Inbound flow states that data enters the service. Outbound flow states that data
+ leaves the service. Bi-directional states that data flows both ways, and unknown
+ states that the direction is not known.</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="inbound"/>
+ <xs:enumeration value="outbound"/>
+ <xs:enumeration value="bi-directional"/>
+ <xs:enumeration value="unknown"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="licenseChoiceType">
+ <xs:choice>
+ <xs:element name="license" type="bom:licenseType" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="expression" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A valid SPDX license expression.
+ Refer to https://spdx.org/specifications for syntax requirements
+
+ Example values:
+ - Apache-2.0 AND (MIT OR GPL-2.0-only)
+ - GPL-3.0-only WITH Classpath-exception-2.0
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:normalizedString">
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the license elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="acknowledgement" type="bom:licenseAcknowledgementEnumerationType">
+ <xs:annotation>
+ <xs:documentation>
+ Declared licenses and concluded licenses represent two different stages in the
+ licensing process within software development. Declared licenses refer to the
+ initial intention of the software authors regarding the licensing terms under
+ which their code is released. On the other hand, concluded licenses are the
+ result of a comprehensive analysis of the project's codebase to identify and
+ confirm the actual licenses of the components used, which may differ from the
+ initially declared licenses. While declared licenses provide an upfront indication
+ of the licensing intentions, concluded licenses offer a more thorough understanding
+ of the actual licensing within a project, facilitating proper compliance and risk
+ management. Observed licenses are defined in `evidence.licenses`. Observed licenses
+ form the evidence necessary to substantiate a concluded license.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+
+ <xs:simpleType name="licenseAcknowledgementEnumerationType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="declared">
+ <xs:annotation>
+ <xs:documentation>
+ Declared licenses represent the initial intentions of authors regarding
+ the licensing terms of their code.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="concluded">
+ <xs:annotation>
+ <xs:documentation>
+ Concluded licenses are verified and confirmed.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="copyrightsType">
+ <xs:sequence>
+ <xs:element name="text" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:simpleType name="identityFieldType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="group"/>
+ <xs:enumeration value="name"/>
+ <xs:enumeration value="version"/>
+ <xs:enumeration value="purl"/>
+ <xs:enumeration value="cpe"/>
+ <xs:enumeration value="omniborId"/>
+ <xs:enumeration value="swhid"/>
+ <xs:enumeration value="swid"/>
+ <xs:enumeration value="hash"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="decimalPercentType">
+ <xs:restriction base="xs:decimal">
+ <xs:minInclusive value="0"/>
+ <xs:maxInclusive value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="evidenceTechnique">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="source-code-analysis">
+ <xs:annotation>
+ <xs:documentation>
+ Examines the source code without executing it.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="binary-analysis">
+ <xs:annotation>
+ <xs:documentation>
+ Examines a compiled binary through reverse engineering, typically via disassembly or bytecode reversal.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="manifest-analysis">
+ <xs:annotation>
+ <xs:documentation>
+ Examines a package management system such as those used for building software or installing software.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="ast-fingerprint">
+ <xs:annotation>
+ <xs:documentation>
+ Examines the Abstract Syntax Tree (AST) of source code or a compiled binary.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="hash-comparison">
+ <xs:annotation>
+ <xs:documentation>
+ Evaluates the cryptographic hash of a component against a set of pre-computed hashes of identified software.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="instrumentation">
+ <xs:annotation>
+ <xs:documentation>
+ Examines the call stack of running applications by intercepting and monitoring application logic without the need to modify the application.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="dynamic-analysis">
+ <xs:annotation>
+ <xs:documentation>
+ Evaluates a running application.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="filename">
+ <xs:annotation>
+ <xs:documentation>
+ Evaluates file name of a component against a set of known file names of identified software.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="attestation">
+ <xs:annotation>
+ <xs:documentation>
+ A testimony to the accuracy of the identify of a component made by an individual or entity.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>
+ Any other technique.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="componentEvidenceType">
+ <xs:sequence>
+ <xs:element name="identity" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>Evidence that substantiates the identity of a component. The identify may be an
+ object or an array of identity objects. Support for specifying identity as a single object was
+ introduced in CycloneDX v1.5. "unbounded" was introduced in v1.6. It is RECOMMENDED that all
+ implementations are aware of "unbounded".</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="field" type="bom:identityFieldType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The identity field of the component which the evidence describes.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="confidence" type="bom:decimalPercentType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The overall confidence of the evidence from 0 - 1, where 1 is 100% confidence.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="concludedValue" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The value of the field (cpe, purl, etc) that has been concluded based on the aggregate of all methods (if available).</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="methods" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The methods used to extract and/or analyze the evidence.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="method" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="technique" type="bom:evidenceTechnique" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The technique used in this method of analysis.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="confidence" type="bom:decimalPercentType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The confidence of the evidence from 0 - 1, where 1 is 100% confidence. Confidence is specific to the technique used. Each technique of analysis can have independent confidence.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The value or contents of the evidence.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="tools" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The object in the BOM identified by its bom-ref. This is often a component or service,
+ but may be any object type supporting bom-refs. Tools used for analysis should already
+ be defined in the BOM, either in the metadata/tools, components, or formulation.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="tool" type="bom:bomReferenceType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="occurrences" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Evidence of individual instances of a component spread across multiple locations.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="occurrence" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="location" type="xs:string" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The location or path to where the component was found.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="line" type="xs:nonNegativeInteger" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The line number where the component was found.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="offset" type="xs:nonNegativeInteger" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The offset where the component was found.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="symbol" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The symbol name that was found associated with the component.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="additionalContext" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Any additional context of the detected component (e.g. a code snippet).</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the occurrence elsewhere
+ in the BOM. Every bom-ref MUST be unique within the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="callstack" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Evidence of the components use through the callstack.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="frames" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="frame" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="package" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A package organizes modules into namespaces, providing a unique namespace for each type it contains.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="module" type="xs:string" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A module or class that encloses functions/methods and other code.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="function" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A block of code designed to perform a particular task.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="parameters" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Optional arguments that are passed to the module or function.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="parameter" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="line" type="xs:integer" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The line number the code that is called resides on.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="column" type="xs:integer" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The column the code that is called resides.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="fullFilename" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The full path and filename of the module.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="tools" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The object in the BOM identified by its bom-ref. This is often a component or service,
+ but may be any object type supporting bom-refs. Tools used for analysis should already
+ be defined in the BOM, either in the metadata/tools, components, or formulation.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="tool" type="bom:bomReferenceType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="copyright" type="bom:copyrightsType" minOccurs="0" maxOccurs="1"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="compositionsType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="composition" type="bom:compositionType"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="compositionType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="aggregate" type="bom:aggregateType" default="not_specified">
+ <xs:annotation>
+ <xs:documentation>Specifies an aggregate type that describe how complete a relationship is.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="assemblies" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The bom-ref identifiers of the components or services being described. Assemblies refer to
+ nested relationships whereby a constituent part may include other constituent parts. References
+ do not cascade to child parts. References are explicit for the specified constituent part only.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="assembly" type="bom:bomReferenceType"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="dependencies" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The bom-ref identifiers of the components or services being described. Dependencies refer to a
+ relationship whereby an independent constituent part requires another independent constituent
+ part. References do not cascade to transitive dependencies. References are explicit for the
+ specified dependency only.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="dependency" type="bom:bomReferenceType"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="vulnerabilities" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The bom-ref identifiers of the vulnerabilities being described.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="vulnerability" type="bom:bomReferenceType"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the composition elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:simpleType name="aggregateType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="complete">
+ <xs:annotation>
+ <xs:documentation>The relationship is complete. No further relationships including constituent components, services, or dependencies are known to exist.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="incomplete">
+ <xs:annotation>
+ <xs:documentation>The relationship is incomplete. Additional relationships exist and may include constituent components, services, or dependencies.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="incomplete_first_party_only">
+ <xs:annotation>
+ <xs:documentation>The relationship is incomplete. Only relationships for first-party components, services, or their dependencies are represented.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="incomplete_first_party_proprietary_only">
+ <xs:annotation>
+ <xs:documentation>The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are proprietary.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="incomplete_first_party_opensource_only">
+ <xs:annotation>
+ <xs:documentation>The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are opensource.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="incomplete_third_party_only">
+ <xs:annotation>
+ <xs:documentation>The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="incomplete_third_party_proprietary_only">
+ <xs:annotation>
+ <xs:documentation>The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are proprietary.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="incomplete_third_party_opensource_only">
+ <xs:annotation>
+ <xs:documentation>The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are opensource.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unknown">
+ <xs:annotation>
+ <xs:documentation>The relationship may be complete or incomplete. This usually signifies a 'best-effort' to obtain constituent components, services, or dependencies but the completeness is inconclusive.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="not_specified">
+ <xs:annotation>
+ <xs:documentation>The relationship completeness is not specified.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="localeType">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Defines a syntax for representing two character language code (ISO-639) followed by an optional two
+ character country code. The language code MUST be lower case. If the country code is specified, the
+ country code MUST be upper case. The language code and country code MUST be separated by a minus sign.
+ Examples: en, en-US, fr, fr-CA
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="([a-z]{2})(-[A-Z]{2})?"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="releaseNotesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="type" type="xs:normalizedString" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The software versioning type. It is RECOMMENDED that the release type use one
+ of 'major', 'minor', 'patch', 'pre-release', or 'internal'. Representing all possible software
+ release types is not practical, so standardizing on the recommended values, whenever possible,
+ is strongly encouraged.
+ * major = A major release may contain significant changes or may introduce breaking changes.
+ * minor = A minor release, also known as an update, may contain a smaller number of changes than major releases.
+ * patch = Patch releases are typically unplanned and may resolve defects or important security issues.
+ * pre-release = A pre-release may include alpha, beta, or release candidates and typically have
+ limited support. They provide the ability to preview a release prior to its general availability.
+ * internal = Internal releases are not for public consumption and are intended to be used exclusively
+ by the project or manufacturer that produced it.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The title of the release.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="featuredImage" type="xs:anyURI" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The URL to an image that may be prominently displayed with the release note.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="socialImage" type="xs:anyURI" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The URL to an image that may be used in messaging on social media platforms.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A short description of the release.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="timestamp" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The date and time (timestamp) when the release note was created.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="aliases" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="alias" type="xs:normalizedString">
+ <xs:annotation>
+ <xs:documentation>One or more alternate names the release may be referred to. This may
+ include unofficial terms used by development and marketing teams (e.g. code names).</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="tags" type="bom:tagsType" minOccurs="0" maxOccurs="1" />
+ <xs:element name="resolves" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A collection of issues that have been resolved.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="issue" type="bom:issueType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="notes" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="note">
+ <xs:annotation>
+ <xs:documentation>Zero or more release notes containing the locale and content. Multiple
+ note elements may be specified to support release notes in a wide variety of languages.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="locale" type="bom:localeType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The ISO-639 (or higher) language code and optional ISO-3166
+ (or higher) country code. Examples include: "en", "en-US", "fr" and "fr-CA".</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="text" type="bom:attachedTextType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Specifies the full content of the release note.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <!--
+ Model card support in CycloneDX is derived from TensorFlow Model Card Toolkit released under the Apache 2.0 license and
+ available from https://github.com/tensorflow/model-card-toolkit/blob/main/model_card_toolkit/schema/v0.0.2/model_card.schema.json.
+ In addition, CycloneDX model card support includes portions of VerifyML, also released under the Apache 2.0 license and
+ available from https://github.com/cylynx/verifyml/blob/main/verifyml/model_card_toolkit/schema/v0.0.4/model_card.schema.json.
+ -->
+ <xs:complexType name="modelCardType">
+ <xs:annotation>
+ <xs:documentation>
+ A model card describes the intended uses of a machine learning model and potential limitations, including
+ biases and ethical considerations. Model cards typically contain the training parameters, which datasets
+ were used to train the model, performance metrics, and other relevant data useful for ML transparency.
+ This object SHOULD be specified for any component of type `machine-learning-model` and MUST NOT be specified
+ for other component types.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="modelParameters" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Hyper-parameters for construction of the model.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="approach" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The overall approach to learning used by the model for problem solving.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="type" type="bom:machineLearningApproachType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Learning types describing the learning problem or hybrid learning problem.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="task" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Directly influences the input and/or output. Examples include classification,
+ regression, clustering, etc.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="architectureFamily" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The model architecture family such as transformer network, convolutional neural
+ network, residual neural network, LSTM neural network, etc.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="modelArchitecture" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The specific architecture of the model such as GPT-1, ResNet-50, YOLOv3, etc.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="datasets" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The datasets used to train and evaluate the model.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="ref" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>References a data component by the components bom-ref attribute</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:union memberTypes="bom:refLinkType bom:bomLinkElementType"/>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="dataset" type="bom:componentDataType" minOccurs="0" maxOccurs="1" />
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="inputs" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The input format(s) of the model
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="input" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="format" type="xs:string" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The data format for input to the model. Example formats include string, image, time-series
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="outputs" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The output format(s) from the model
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="output" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="format" type="xs:string" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The data format for output from the model. Example formats include string, image, time-series
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="quantitativeAnalysis" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A quantitative analysis of the model
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="performanceMetrics" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="performanceMetric" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The type of performance metric.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The value of the performance metric.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="slice" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the slice this metric was computed on. By default, assume
+ this metric is not sliced.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="confidenceInterval" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The confidence interval of the metric.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="lowerBound" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The lower bound of the confidence interval.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="upperBound" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The upper bound of the confidence interval.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="graphics" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A collection of graphics that represent various measurements
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A description of this collection of graphics.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="collection" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A collection of graphics.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="graphic" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the graphic.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="image" type="bom:attachedTextType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The graphic (vector or raster). Base64 encoding MUST be specified for binary images.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="considerations" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ What considerations should be taken into account regarding the model's construction, training,
+ and application?
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="users" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Who are the intended users of the model?
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="user" type="xs:string" minOccurs="0" maxOccurs="1" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="useCases" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ What are the intended use cases of the model?
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="useCase" type="xs:string" minOccurs="0" maxOccurs="1" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="technicalLimitations" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ What are the known technical limitations of the model? E.g. What kind(s) of data
+ should the model be expected not to perform well on? What are the factors that might
+ degrade model performance?
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="technicalLimitation" type="xs:string" minOccurs="0" maxOccurs="1" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="performanceTradeoffs" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ What are the known tradeoffs in accuracy/performance of the model?
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="performanceTradeoff" type="xs:string" minOccurs="0" maxOccurs="1" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ethicalConsiderations" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ What are the ethical risks involved in the application of this model?
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="ethicalConsideration" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the risk
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="mitigationStrategy" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Strategy used to address this risk
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="environmentalConsiderations" type="bom:environmentalConsiderationsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ What are the various environmental impacts the corresponding machine learning model has exhibited across its lifecycle?
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="fairnessAssessments" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ How does the model affect groups at risk of being systematically disadvantaged?
+ What are the harms and benefits to the various affected groups?
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="fairnessAssessment" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="groupAtRisk" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The groups or individuals at risk of being systematically disadvantaged by the model.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="benefits" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Expected benefits to the identified groups.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="harms" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Expected harms to the identified groups.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="mitigationStrategy" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ With respect to the benefits and harms outlined, please
+ describe any mitigation strategy implemented.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the model card elsewhere in the BOM.
+ Every bom-ref MUST be unique within the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="environmentalConsiderationsType">
+ <xs:annotation>
+ <xs:documentation>
+ Describes various environmental impact metrics.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="energyConsumptions" type="bom:energyConsumptionsType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Describes energy consumption information incurred for one or more component lifecycle activities.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="energyConsumptionsType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="energyConsumption" type="bom:energyConsumptionType"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="energyConsumptionType">
+ <xs:annotation>
+ <xs:documentation>
+ Describes energy consumption information incurred for the specified lifecycle activity.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="activity" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The type of activity that is part of a machine learning model development or operational lifecycle.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="design">
+ <xs:annotation>
+ <xs:documentation>
+ model design including problem framing, goal definition and algorithm selection.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="data-collection">
+ <xs:annotation>
+ <xs:documentation>
+ model data acquisition including search, selection and transfer.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="data-preparation">
+ <xs:annotation>
+ <xs:documentation>
+ model data preparation including data cleaning, labeling and conversion.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="training">
+ <xs:annotation>
+ <xs:documentation>
+ model building, training and generalized tuning.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fine-tuning">
+ <xs:annotation>
+ <xs:documentation>
+ refining a trained model to produce desired outputs for a given problem space.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="validation">
+ <xs:annotation>
+ <xs:documentation>
+ model validation including model output evaluation and testing.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="deployment">
+ <xs:annotation>
+ <xs:documentation>
+ explicit model deployment to a target hosting infrastructure.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="inference">
+ <xs:annotation>
+ <xs:documentation>
+ generating an output response from a hosted model from a set of inputs.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>
+ a lifecycle activity type whose description does not match currently defined values.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="energyProviders" type="bom:energyProviderType" minOccurs="1" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The provider(s) of the energy consumed by the associated model development lifecycle activity.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="activityEnergyCost" type="bom:energyMeasureType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The total energy cost associated with the model lifecycle activity.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="co2CostEquivalent" type="bom:co2MeasureType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The CO2 cost (debit) equivalent to the total energy cost.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="co2CostOffset" type="bom:co2MeasureType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The CO2 offset (credit) for the CO2 equivalent cost.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="energyMeasureType">
+ <xs:annotation>
+ <xs:documentation>
+ A measure of energy.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="value" type="xs:decimal" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Quantity of energy.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="unit" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Unit of energy.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="kWh">
+ <xs:annotation>
+ <xs:documentation>
+ kilowatt-hour (kWh) is the energy delivered by one kilowatt (kW) of power for one hour (h).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="co2MeasureType">
+ <xs:annotation>
+ <xs:documentation>
+ A measure of carbon dioxide (CO2).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="value" type="xs:decimal" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Quantity of carbon dioxide (CO2).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="unit" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Unit of carbon dioxide (CO2).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="tCO2eq">
+ <xs:annotation>
+ <xs:documentation>
+ Tonnes (t) of carbon dioxide (CO2) equivalent (eq).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="energyProviderType">
+ <xs:annotation>
+ <xs:documentation>
+ Describes the physical provider of energy used for model development or operations.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A description of the energy provider.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="organization" type="bom:organizationalEntity" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The organization of the energy provider.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="energySource" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The energy source for the energy provider.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="coal">
+ <xs:annotation>
+ <xs:documentation>
+ Energy produced by types of coal.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="oil">
+ <xs:annotation>
+ <xs:documentation>
+ Petroleum products (primarily crude oil and its derivative fuel oils).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="natural-gas">
+ <xs:annotation>
+ <xs:documentation>
+ Hydrocarbon gas liquids (HGL) that occur as gases at atmospheric pressure and as liquids under higher pressures including Natural gas (C5H12 and heavier), Ethane (C2H6), Propane (C3H8), etc.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="nuclear">
+ <xs:annotation>
+ <xs:documentation>
+ Energy produced from the cores of atoms (i.e., through nuclear fission or fusion).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="wind">
+ <xs:annotation>
+ <xs:documentation>
+ Energy produced from moving air.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="solar">
+ <xs:annotation>
+ <xs:documentation>
+ Energy produced from the sun (i.e., solar radiation).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="geothermal">
+ <xs:annotation>
+ <xs:documentation>
+ Energy produced from heat within the earth.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="hydropower">
+ <xs:annotation>
+ <xs:documentation>
+ Energy produced from flowing water.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="biofuel">
+ <xs:annotation>
+ <xs:documentation>
+ Liquid fuels produced from biomass feedstocks (i.e., organic materials such as plants or animals).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unknown">
+ <xs:annotation>
+ <xs:documentation>
+ The energy source is unknown.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>
+ An energy source that is not listed.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="energyProvided" type="bom:energyMeasureType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The energy provided by the energy source for an associated activity.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="externalReferences" type="bom:externalReferences" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the energy provider elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="postalAddressType">
+ <xs:annotation>
+ <xs:documentation>
+ An address used to identify a contactable location.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="country" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The country name or the two-letter ISO 3166-1 country code.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="region" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The region or state in the country. For example, Texas.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="locality" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The locality or city within the country. For example, Austin.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="postOfficeBoxNumber" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The post office box number. For example, 901.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="postalCode" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The postal code. For example, 78758.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="streetAddress" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The street address. For example, 100 Main Street.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the address elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:simpleType name="machineLearningApproachType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="supervised">
+ <xs:annotation>
+ <xs:documentation>
+ Supervised machine learning involves training an algorithm on labeled
+ data to predict or classify new data based on the patterns learned from
+ the labeled examples.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unsupervised">
+ <xs:annotation>
+ <xs:documentation>
+ Unsupervised machine learning involves training algorithms on unlabeled
+ data to discover patterns, structures, or relationships without explicit
+ guidance, allowing the model to identify inherent structures or clusters
+ within the data.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="reinforcement-learning">
+ <xs:annotation>
+ <xs:documentation>
+ Reinforcement learning is a type of machine learning where an agent learns
+ to make decisions by interacting with an environment to maximize cumulative
+ rewards, through trial and error.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="semi-supervised">
+ <xs:annotation>
+ <xs:documentation>
+ Semi-supervised machine learning utilizes a combination of labeled and
+ unlabeled data during training to improve model performance, leveraging
+ the benefits of both supervised and unsupervised learning techniques.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="self-supervised">
+ <xs:annotation>
+ <xs:documentation>
+ Self-supervised machine learning involves training models to predict parts
+ of the input data from other parts of the same data, without requiring
+ external labels, enabling learning from large amounts of unlabeled data.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="componentDataType">
+ <xs:sequence>
+ <xs:element name="type" type="bom:componentDataTypeEnumeration" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The general theme or subject matter of the data being specified.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the dataset.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="contents" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The contents or references to the contents of the data being described.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="attachment" type="bom:attachedTextType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>An optional way to include textual or encoded data.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="url" type="xs:anyURI" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The URL to where the data can be retrieved.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document name-value parameters used for configuration.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="classification" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Data classification tags data according to its type, sensitivity, and value if altered, stolen, or destroyed.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="sensitiveData" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ A description of any sensitive data in a dataset.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="graphics" type="bom:graphicsCollectionType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A collection of graphics that represent various measurements.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A description of the dataset. Can describe size of dataset, whether it's used for source code,
+ training, testing, or validation, etc.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="governance" type="bom:dataGovernance" minOccurs="0" maxOccurs="1" />
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the dataset elsewhere in the BOM.
+ Every bom-ref MUST be unique within the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="dataGovernance">
+ <xs:sequence>
+ <xs:element name="custodians" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Data custodians are responsible for the safe custody, transport, and storage of data.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="custodian" type="bom:organizationOrIndividualType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="stewards" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Data stewards are responsible for data content, context, and associated business rules.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="steward" type="bom:organizationOrIndividualType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="owners" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Data owners are concerned with risk and appropriate access to data.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="owner" type="bom:organizationOrIndividualType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="organizationOrIndividualType">
+ <xs:choice>
+ <xs:element name="organization" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1" />
+ <xs:element name="individual" type="bom:organizationalContact" minOccurs="0" maxOccurs="1" />
+ </xs:choice>
+ </xs:complexType>
+
+ <xs:complexType name="graphicsCollectionType">
+ <xs:annotation>
+ <xs:documentation>
+ A collection of graphics that represent various measurements.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="description" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A description of this collection of graphics.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="collection" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A collection of graphics.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="graphic" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the graphic.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="image" type="bom:attachedTextType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The graphic (vector or raster). Base64 encoding MUST be specified for binary images.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:simpleType name="componentDataTypeEnumeration">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="source-code">
+ <xs:annotation>
+ <xs:documentation>Any type of code, code snippet, or data-as-code.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="configuration">
+ <xs:annotation>
+ <xs:documentation>Parameters or settings that may be used by other components.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="dataset">
+ <xs:annotation>
+ <xs:documentation>A collection of data.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="definition">
+ <xs:annotation>
+ <xs:documentation>Data that can be used to create new instances of what the definition defines.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>Any other type of data that does not fit into existing definitions.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="bomReferenceType">
+ <xs:attribute name="ref" use="required">
+ <xs:annotation>
+ <xs:documentation>References a component or service by its bom-ref attribute</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:union memberTypes="bom:refLinkType bom:bomLinkType"/>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="property" type="bom:propertyType"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="propertyType">
+ <xs:annotation>
+ <xs:documentation>Specifies an individual property with a name and value.</xs:documentation>
+ </xs:annotation>
+ <xs:simpleContent>
+ <xs:extension base="xs:normalizedString">
+ <xs:attribute name="name" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>The name of the property. Duplicate names are allowed, each potentially having a different value.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:complexType name="vulnerabilitiesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="vulnerability" type="bom:vulnerabilityType">
+ <xs:annotation>
+ <xs:documentation>Defines a weakness in a component or service that could be exploited or triggered by a threat source.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="vulnerabilityType">
+ <xs:sequence minOccurs="0" maxOccurs="1">
+ <xs:element name="id" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The identifier that uniquely identifies the vulnerability. For example:
+ CVE-2021-39182, GHSA-35m5-8cvj-8783, and SNYK-PYTHON-ENROCRYPT-1912876.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="source" type="bom:vulnerabilitySourceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The source that published the vulnerability.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="references" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Zero or more pointers to vulnerabilities that are the equivalent of the
+ vulnerability specified. Often times, the same vulnerability may exist in multiple sources of
+ vulnerability intelligence, but have different identifiers. References provide a way to
+ correlate vulnerabilities across multiple sources of vulnerability intelligence.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="reference">
+ <xs:annotation>
+ <xs:documentation>A pointer to a vulnerability that is the equivalent of the
+ vulnerability specified.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="1" maxOccurs="1">
+ <xs:element name="id" type="xs:normalizedString" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The identifier that uniquely identifies the vulnerability. For example:
+ CVE-2021-39182, GHSA-35m5-8cvj-8783, and SNYK-PYTHON-ENROCRYPT-1912876.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="source" type="bom:vulnerabilitySourceType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The source that published the vulnerability.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ratings" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">List of vulnerability ratings.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="rating" type="bom:ratingType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="cwes" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ List of Common Weaknesses Enumerations (CWEs) codes that describes this vulnerability.
+ For example 399 (of https://cwe.mitre.org/data/definitions/399.html)
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="cwe" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A description of the vulnerability as provided by the source.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="detail" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>If available, an in-depth description of the vulnerability as provided by the
+ source organization. Details often include information useful in understanding root cause.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="recommendation" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Recommendations of how the vulnerability can be remediated or mitigated.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="workaround" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A bypass, usually temporary, of the vulnerability that reduces its likelihood and/or impact. Workarounds often involve changes to configuration or deployments.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="proofOfConcept" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Evidence used to reproduce the vulnerability.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="reproductionSteps" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Precise steps to reproduce the vulnerability.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="environment" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A description of the environment in which reproduction was possible.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="supportingMaterial" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Supporting material that helps in reproducing or understanding how reproduction is possible. This may include screenshots, payloads, and PoC exploit code.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="attachment" type="bom:attachedTextType" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="advisories" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Published advisories of the vulnerability if provided.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="advisory" type="bom:advisoryType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="created" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The date and time (timestamp) when the vulnerability record was created in the vulnerability database.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="published" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The date and time (timestamp) when the vulnerability record was first published.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="updated" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The date and time (timestamp) when the vulnerability record was last updated.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="rejected" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The date and time (timestamp) when the vulnerability record was rejected (if applicable).</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="credits" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Individuals or organizations credited with the discovery of the vulnerability.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="organizations" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The organizations credited with vulnerability discovery.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="organization" type="bom:organizationalEntity"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="individuals" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The individuals, not associated with organizations, that are credited with vulnerability discovery.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="individual" type="bom:organizationalContact"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="tools" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The tool(s) used to identify, confirm, or score the vulnerability.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="tool" minOccurs="0" type="bom:toolType">
+ <xs:annotation>
+ <xs:documentation>DEPRECATED. Use tools\components or tools\services instead.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:sequence minOccurs="0" maxOccurs="1">
+ <xs:element name="components" type="bom:componentsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A list of software and hardware components used as tools.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="services" type="bom:servicesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A list of services used as tools.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="analysis" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ An assessment of the impact and exploitability of the vulnerability.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0" maxOccurs="1">
+ <xs:element name="state" type="bom:impactAnalysisStateType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Declares the current state of an occurrence of a vulnerability, after automated or manual analysis.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="justification" type="bom:impactAnalysisJustificationType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ The rationale of why the impact analysis state was asserted.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="responses" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A response to the vulnerability by the manufacturer, supplier, or
+ project responsible for the affected component or service. More than one response
+ is allowed. Responses are strongly encouraged for vulnerabilities where the analysis
+ state is exploitable.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="response" type="bom:impactAnalysisResponsesType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="detail" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Detailed description of the impact including methods used during assessment.
+ If a vulnerability is not exploitable, this field should include specific details
+ on why the component or service is not impacted by this vulnerability.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="firstIssued" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ The date and time (timestamp) when the analysis was first issued.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="lastUpdated" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ The date and time (timestamp) when the analysis was last updated.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="affects" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The components or services that are affected by the vulnerability.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="target">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="1">
+ <xs:element name="ref" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>References a component or service by the objects bom-ref.</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:union memberTypes="bom:refLinkType bom:bomLinkElementType"/>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="versions" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Zero or more individual versions or range of versions.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="version">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="1">
+ <xs:choice>
+ <xs:element name="version" type="bom:versionType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A single version of a component or service.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="range" type="bom:versionRangeType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ <xs:element name="status" type="bom:impactAnalysisAffectedStatusType" minOccurs="0" maxOccurs="1" default="affected">
+ <xs:annotation>
+ <xs:documentation>
+ The vulnerability status for the version or range of versions.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the vulnerability elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="vulnerabilitySourceType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="name" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The name of the source.
+ For example: NVD, National Vulnerability Database, OSS Index, VulnDB, and GitHub Advisories
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="url" type="xs:anyURI" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The url of the vulnerability documentation as provided by the source.
+ For example: https://nvd.nist.gov/vuln/detail/CVE-2021-39182</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="ratingType">
+ <xs:sequence>
+ <xs:element name="source" type="bom:vulnerabilitySourceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The source that calculated the severity or risk rating of the vulnerability.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="score" type="xs:decimal" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The numerical score of the rating.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="severity" type="bom:severityType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Textual representation of the severity that corresponds to the numerical score of the rating.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="method" type="bom:scoreSourceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The risk scoring methodology/standard used.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="vector" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Textual representation of the metric values used to score the vulnerability.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="justification" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>An optional reason for rating the vulnerability as it was.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="advisoryType">
+ <xs:sequence>
+ <xs:element name="title" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>An optional name of the advisory.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="url" type="xs:anyURI" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Location where the advisory can be obtained.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="annotationsType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="annotation" type="bom:annotationType"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="annotatorChoiceType">
+ <xs:choice>
+ <xs:element name="organization" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The organization that created the annotation</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="individual" type="bom:organizationalContact" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The person that created the annotation</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="component" type="bom:component" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The tool or component that created the annotation</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="service" type="bom:service" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The service that created the annotation</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+
+ <xs:complexType name="annotationType">
+ <xs:sequence>
+ <xs:element name="subjects" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The objects in the BOM identified by their bom-ref's. This is often components or services, but may be any object type supporting bom-refs.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="subject" type="bom:bomReferenceType"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="annotator" type="bom:annotatorChoiceType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The organization, individual, component, or service which created the textual content
+ of the annotation.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="timestamp" type="xs:dateTime" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The date and time (timestamp) when the annotation was created.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="text" type="xs:string" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The textual content of the annotation.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the annotation elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:simpleType name="severityType" final="restriction">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Textual representation of the severity of the vulnerability adopted by the analysis method. If the
+ analysis method uses values other than what is provided, the user is expected to translate appropriately.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="critical"/>
+ <xs:enumeration value="high"/>
+ <xs:enumeration value="medium"/>
+ <xs:enumeration value="low"/>
+ <xs:enumeration value="info"/>
+ <xs:enumeration value="none"/>
+ <xs:enumeration value="unknown"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="impactAnalysisStateType" final="restriction">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Declares the current state of an occurrence of a vulnerability, after automated or manual analysis.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="resolved">
+ <xs:annotation>
+ <xs:documentation>
+ The vulnerability has been remediated.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="resolved_with_pedigree">
+ <xs:annotation>
+ <xs:documentation>
+ The vulnerability has been remediated and evidence of the changes are provided in the affected
+ components pedigree containing verifiable commit history and/or diff(s).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="exploitable">
+ <xs:annotation>
+ <xs:documentation>
+ The vulnerability may be directly or indirectly exploitable.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="in_triage">
+ <xs:annotation>
+ <xs:documentation>
+ The vulnerability is being investigated.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="false_positive">
+ <xs:annotation>
+ <xs:documentation>
+ The vulnerability is not specific to the component or service and was falsely identified or associated.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="not_affected">
+ <xs:annotation>
+ <xs:documentation>
+ The component or service is not affected by the vulnerability. Justification should be specified
+ for all not_affected cases.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="impactAnalysisJustificationType" final="restriction">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ The rationale of why the impact analysis state was asserted.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="code_not_present">
+ <xs:annotation>
+ <xs:documentation>
+ The code has been removed or tree-shaked.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="code_not_reachable">
+ <xs:annotation>
+ <xs:documentation>
+ The vulnerable code is not invoked at runtime.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="requires_configuration">
+ <xs:annotation>
+ <xs:documentation>
+ Exploitability requires a configurable option to be set/unset.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="requires_dependency">
+ <xs:annotation>
+ <xs:documentation>
+ Exploitability requires a dependency that is not present.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="requires_environment">
+ <xs:annotation>
+ <xs:documentation>
+ Exploitability requires a certain environment which is not present.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="protected_by_compiler">
+ <xs:annotation>
+ <xs:documentation>
+ Exploitability requires a compiler flag to be set/unset.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="protected_at_runtime">
+ <xs:annotation>
+ <xs:documentation>
+ Exploits are prevented at runtime.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="protected_at_perimeter">
+ <xs:annotation>
+ <xs:documentation>
+ Attacks are blocked at physical, logical, or network perimeter.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="protected_by_mitigating_control">
+ <xs:annotation>
+ <xs:documentation>
+ Preventative measures have been implemented that reduce the likelihood and/or impact of the vulnerability.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="scoreSourceType" final="restriction">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Specifies the severity or risk scoring methodology or standard used.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="CVSSv2">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Common Vulnerability Scoring System v2.0 standard as defined at https://www.first.org/cvss/v2/
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="CVSSv3">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Common Vulnerability Scoring System v3.0 standard as defined at https://www.first.org/cvss/v3-0/
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="CVSSv31">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Common Vulnerability Scoring System v3.1 standard as defined at https://www.first.org/cvss/v3-1/
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="CVSSv4">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Common Vulnerability Scoring System v4.0 standard as defined at https://www.first.org/cvss/v4-0/
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="OWASP">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ OWASP Risk Rating as defined at https://owasp.org/www-community/OWASP_Risk_Rating_Methodology
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="SSVC">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Stakeholder Specific Vulnerability Categorization as defined at https://github.com/CERTCC/SSVC
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ Another severity or risk scoring methodology
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="impactAnalysisResponsesType" final="restriction">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ The rationale of why the impact analysis state was asserted.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="can_not_fix"/>
+ <xs:enumeration value="will_not_fix"/>
+ <xs:enumeration value="update"/>
+ <xs:enumeration value="rollback"/>
+ <xs:enumeration value="workaround_available"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="impactAnalysisAffectedStatusType" final="restriction">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ The vulnerability status of a given version or range of versions of a product. The statuses
+ 'affected' and 'unaffected' indicate that the version is affected or unaffected by the vulnerability.
+ The status 'unknown' indicates that it is unknown or unspecified whether the given version is affected.
+ There can be many reasons for an 'unknown' status, including that an investigation has not been
+ undertaken or that a vendor has not disclosed the status.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="affected"/>
+ <xs:enumeration value="unaffected"/>
+ <xs:enumeration value="unknown"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="formulationType">
+ <xs:annotation>
+ <xs:documentation>
+ Describes how a component or service was manufactured or deployed. This is achieved through the use
+ of formulas, workflows, tasks, and steps, which declare the precise steps to reproduce along with the
+ observed formulas describing the steps which transpired in the manufacturing process.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="formula" type="bom:formulaType"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="formulaType">
+ <xs:annotation>
+ <xs:documentation>
+ Describes workflows and resources that captures rules and other aspects of how the associated
+ BOM component or service was formed.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="components" type="bom:componentsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Transient components that are used in tasks that constitute one or more of
+ this formula's workflows</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="services" type="bom:servicesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Transient services that are used in tasks that constitute one or more of
+ this formula's workflows</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="workflows" type="bom:workflowsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>List of workflows that can be declared to accomplish specific orchestrated goals
+ and independently triggered.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the formula elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="workflowsType">
+ <xs:sequence>
+ <xs:element name="workflow" type="bom:workflowType" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="workflowType">
+ <xs:sequence>
+ <xs:element name="uid" type="xs:string" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The unique identifier for the resource instance within its deployment context.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The description of the resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="resourceReferences" type="bom:resourceReferencesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>References to component or service resources that are used to realize
+ the resource instance.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="tasks" type="bom:tasksType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The tasks that comprise the workflow.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="taskDependencies" type="bom:dependenciesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The graph of dependencies between tasks within the workflow.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="taskTypes" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Indicates the types of activities performed by the set of workflow tasks.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="taskType" type="bom:taskTypeEnum" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="trigger" type="bom:triggerType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The trigger that initiated the task.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="steps" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The sequence of steps for the task.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="step" type="bom:stepType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="inputs" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Represents resources and data brought into a task at runtime by executor
+ or task commands</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="input" type="bom:inputType" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="outputs" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Represents resources and data output from a task at runtime by executor
+ or task commands</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="output" type="bom:outputType" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="timeStart" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time (timestamp) when the task started.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="timeEnd" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time (timestamp) when the task ended.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="workspaces" type="bom:workspacesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A set of named filesystem or data resource shareable by workflow tasks.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="runtimeTopology" type="bom:dependenciesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A graph of the component runtime topology for workflow's instance.
+ A description of the runtime component and service topology. This can describe a partial or
+ complete topology used to host and execute the task (e.g., hardware, operating systems,
+ configurations, etc.)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the workflow elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="resourceReferencesType">
+ <xs:sequence>
+ <xs:element name="resourceReference" type="bom:resourceReferenceType" minOccurs="0" maxOccurs="unbounded" />
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="resourceReferenceType">
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="ref" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ References an object by its bom-ref attribute
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:union memberTypes="bom:refLinkType bom:bomLinkElementType"/>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="externalReference" type="bom:externalReference" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Reference to an externally accessible resource.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="tasksType">
+ <xs:sequence>
+ <xs:element name="task" type="bom:taskType" minOccurs="0" maxOccurs="unbounded" />
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="taskType">
+ <xs:sequence>
+ <xs:element name="uid" type="xs:string" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The unique identifier for the resource instance within its deployment context.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The description of the resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="resourceReferences" type="bom:resourceReferencesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ References to component or service resources that are used to realize the resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="taskTypes" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Indicates the types of activities performed by the set of workflow tasks.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="taskType" type="bom:taskTypeEnum" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="trigger" type="bom:triggerType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The trigger that initiated the task.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="steps" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The sequence of steps for the task.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="step" type="bom:stepType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="inputs" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Represents resources and data brought into a task at runtime by executor or task commands.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="input" type="bom:inputType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="outputs" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Represents resources and data output from a task at runtime by executor or task commands
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="output" type="bom:outputType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="timeStart" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time (timestamp) when the task started.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="timeEnd" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time (timestamp) when the task ended.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="workspaces" type="bom:workspacesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A set of named filesystem or data resource shareable by workflow tasks.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="runtimeTopology" type="bom:dependenciesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A graph of the component runtime topology for task's instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the task elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:simpleType name="taskTypeEnum">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="copy">
+ <xs:annotation>
+ <xs:documentation>A task that copies software or data used to accomplish other tasks in the workflow.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="clone">
+ <xs:annotation>
+ <xs:documentation>A task that clones a software repository into the workflow in order to retrieve its source code or data for use in a build step.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="lint">
+ <xs:annotation>
+ <xs:documentation>A task that checks source code for programmatic and stylistic errors.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="scan">
+ <xs:annotation>
+ <xs:documentation>A task that performs a scan against source code, or built or deployed components and services. Scans are typically run to gather or test for security vulnerabilities or policy compliance.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="merge">
+ <xs:annotation>
+ <xs:documentation>A task that merges changes or fixes into source code prior to a build step in the workflow.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="build">
+ <xs:annotation>
+ <xs:documentation>A task that builds the source code, dependencies and/or data into an artifact that can be deployed to and executed on target systems.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="test">
+ <xs:annotation>
+ <xs:documentation>A task that verifies the functionality of a component or service.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="deliver">
+ <xs:annotation>
+ <xs:documentation>A task that delivers a built artifact to one or more target repositories or storage systems.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="deploy">
+ <xs:annotation>
+ <xs:documentation>A task that deploys a built artifact for execution on one or more target systems.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="release">
+ <xs:annotation>
+ <xs:documentation>A task that releases a built, versioned artifact to a target repository or distribution system.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="clean">
+ <xs:annotation>
+ <xs:documentation>A task that cleans unnecessary tools, build artifacts and/or data from workflow storage.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>A workflow task that does not match current task type definitions.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="workspacesType">
+ <xs:sequence>
+ <xs:element name="workspace" type="bom:workspaceType" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="workspaceType">
+ <xs:annotation>
+ <xs:documentation>
+ A named filesystem or data resource shareable by workflow tasks.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="uid" type="xs:string" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The unique identifier for the resource instance within its deployment context.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="aliases" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The names for the workspace as referenced by other workflow tasks. Effectively, a name mapping
+ so other tasks can use their own local name in their steps.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="alias" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The description of the resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="resourceReferences" type="bom:resourceReferencesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ References to component or service resources that are used to realize the resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="accessMode" type="bom:accessModeEnum" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Describes the read-write access control for the workspace relative to the owning resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="mountPath" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A path to a location on disk where the workspace will be available to the associated task's steps.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="managedDataType" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of a domain-specific data type the workspace represents. This property is for CI/CD
+ frameworks that are able to provide access to structured, managed data at a more granular level
+ than a filesystem.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="volumeRequest" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Identifies the reference to the request for a specific volume type and parameters.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="volume" type="bom:volumeType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Information about the actual volume instance allocated to the workspace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the workflow elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:simpleType name="accessModeEnum">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="read-only"/>
+ <xs:enumeration value="read-write"/>
+ <xs:enumeration value="read-write-once"/>
+ <xs:enumeration value="write-once"/>
+ <xs:enumeration value="write-only"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="volumeType">
+ <xs:annotation>
+ <xs:documentation>
+ An identifiable, logical unit of data storage tied to a physical device.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="uid" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The unique identifier for the volume instance within its deployment context.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the volume instance
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="mode" type="bom:volumeModeEnum" minOccurs="0" maxOccurs="1" default="filesystem">
+ <xs:annotation>
+ <xs:documentation>
+ The mode for the volume instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="path" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The underlying path created from the actual volume.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="sizeAllocated" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The allocated size of the volume accessible to the associated workspace. This should include
+ the scalar size as well as IEC standard unit in either decimal or binary form.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="persistent" type="xs:boolean" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Indicates if the volume persists beyond the life of the resource it is associated with.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="remote" type="xs:boolean" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Indicates if the volume is remotely (i.e., network) attached.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:simpleType name="volumeModeEnum">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="filesystem"/>
+ <xs:enumeration value="block"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="stepType">
+ <xs:annotation>
+ <xs:documentation>
+ Executes specific commands or tools in order to accomplish its owning task as part of a sequence.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A name for the step.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A description of the step.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="commands" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Ordered list of commands or directives for the step
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="command" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="executed" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A text representation of the executed command.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="triggerType">
+ <xs:sequence>
+ <xs:element name="uid" type="xs:string" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The unique identifier for the resource instance within its deployment context.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The description of the resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="resourceReferences" type="bom:resourceReferencesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ References to component or service resources that are used to realize the resource instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="type" type="bom:triggerTypeType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The source type of event which caused the trigger to fire.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="event" type="bom:eventType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The event data that caused the associated trigger to activate.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="conditions" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="condition" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ A condition that was used to determine a trigger should be activated.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Describes the set of conditions which cause the trigger to activate.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="expression" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The logical expression that was evaluated that determined the trigger should be fired.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="timeActivated" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time (timestamp) when the trigger was activated.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="inputs" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Represents resources and data brought into a task at runtime by executor or task commands
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="input" type="bom:inputType" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="outputs" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Represents resources and data output from a task at runtime by executor or task commands
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="output" type="bom:outputType" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the trigger elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:simpleType name="triggerTypeType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="manual"/>
+ <xs:enumeration value="api"/>
+ <xs:enumeration value="webhook"/>
+ <xs:enumeration value="scheduled"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="eventType">
+ <xs:sequence>
+ <xs:element name="uid" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The unique identifier of the event.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A description of the event.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="timeReceived" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time (timestamp) when the event was received.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="data" type="bom:attachedTextType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Encoding of the raw event data.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="source" type="bom:resourceReferenceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ References the component or service that was the source of the event
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="target" type="bom:resourceReferenceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ References the component or service that was the target of the event
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="inputType">
+ <xs:annotation>
+ <xs:documentation>
+ Type that represents various input data types and formats.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="resource" type="bom:resourceReferenceType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A reference to an independent resource provided as an input to a task by the workflow runtime.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="parameters" type="bom:parametersType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Inputs that have the form of parameters with names and values.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="environmentVars" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Inputs that have the form of parameters with names and values.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <!-- maxOccurs="unbounded" NEEDS to be set on the sequence, not the individual elements -->
+ <xs:choice>
+ <xs:element name="environmentVar" type="bom:propertyType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="data" type="bom:attachedTextType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Inputs that have the form of data.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ <xs:element name="source" type="bom:resourceReferenceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A references to the component or service that provided the input to the task
+ (e.g., reference to a service with data flow value of inbound)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="target" type="bom:resourceReferenceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A reference to the component or service that received or stored the input if not the task
+ itself (e.g., a local, named storage workspace)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="outputType">
+ <xs:annotation>
+ <xs:documentation>
+ Represents resources and data output from a task at runtime by executor or task commands
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="resource" type="bom:resourceReferenceType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A reference to an independent resource generated as output by the task.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="environmentVars" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Outputs that have the form of environment variables.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <!-- maxOccurs="unbounded" NEEDS to be set on the sequence, not the individual elements -->
+ <xs:choice>
+ <xs:element name="environmentVar" type="bom:propertyType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="data" type="bom:attachedTextType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Outputs that have the form of data.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ <xs:element name="type" type="bom:outputTypeEnum" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Describes the type of data output.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="source" type="bom:resourceReferenceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Component or service that generated or provided the output from the task (e.g., a build tool)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="target" type="bom:resourceReferenceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Component or service that received the output from the task
+ (e.g., reference to an artifactory service with data flow value of outbound)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:simpleType name="outputTypeEnum">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="artifact"/>
+ <xs:enumeration value="attestation"/>
+ <xs:enumeration value="log"/>
+ <xs:enumeration value="evidence"/>
+ <xs:enumeration value="metrics"/>
+ <xs:enumeration value="other"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="parametersType">
+ <xs:sequence>
+ <xs:element name="parameter" type="bom:parameterType" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="parameterType">
+ <xs:annotation>
+ <xs:documentation>
+ A representation of a functional parameter.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the parameter.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The value of the parameter.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="dataType" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The data type of the parameter.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="cryptoPropertiesType">
+ <xs:annotation>
+ <xs:documentation>
+ Cryptographic assets have properties that uniquely define them and that make them actionable for
+ further reasoning. As an example, it makes a difference if one knows the algorithm family (e.g. AES)
+ or the specific variant or instantiation (e.g. AES-128-GCM). This is because the security level and the
+ algorithm primitive (authenticated encryption) is only defined by the definition of the algorithm variant.
+ The presence of a weak cryptographic algorithm like SHA1 vs. HMAC-SHA1 also makes a difference.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="assetType" minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Cryptographic assets occur in several forms. Algorithms and protocols are most commonly
+ implemented in specialized cryptographic libraries. They may however also be 'hardcoded'
+ in software components. Certificates and related cryptographic material like keys, tokens,
+ secrets or passwords are other cryptographic assets to be modelled.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="algorithm">
+ <xs:annotation>
+ <xs:documentation>
+ Mathematical function commonly used for data encryption, authentication, and
+ digital signatures.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="certificate">
+ <xs:annotation>
+ <xs:documentation>
+ An electronic document that is used to provide the identity or validate a public key.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="protocol">
+ <xs:annotation>
+ <xs:documentation>
+ A set of rules and guidelines that govern the behavior and communication with each other.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="related-crypto-material">
+ <xs:annotation>
+ <xs:documentation>
+ Other cryptographic assets that are related to algorithms, certificate, and protocols
+ such as keys and tokens.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="algorithmProperties" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Additional properties specific to a cryptographic algorithm.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="primitive" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Cryptographic building blocks used in higher-level cryptographic systems and
+ protocols. Primitives represent different cryptographic routines: deterministic
+ random bit generators (drbg, e.g. CTR_DRBG from NIST SP800-90A-r1), message
+ authentication codes (mac, e.g. HMAC-SHA-256), blockciphers (e.g. AES),
+ streamciphers (e.g. Salsa20), signatures (e.g. ECDSA), hash functions (e.g. SHA-256),
+ public-key encryption schemes (pke, e.g. RSA), extended output functions
+ (xof, e.g. SHAKE256), key derivation functions (e.g. pbkdf2), key agreement
+ algorithms (e.g. ECDH), key encapsulation mechanisms (e.g. ML-KEM), authenticated
+ encryption (ae, e.g. AES-GCM) and the combination of multiple algorithms
+ (combiner, e.g. SP800-56Cr2).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="drbg">
+ <xs:annotation>
+ <xs:documentation>
+ Deterministic Random Bit Generator (DRBG) is a type of pseudorandom
+ number generator designed to produce a sequence of bits from an initial
+ seed value. DRBGs are commonly used in cryptographic applications where
+ reproducibility of random values is important.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="mac">
+ <xs:annotation>
+ <xs:documentation>
+ In cryptography, a Message Authentication Code (MAC) is information
+ used for authenticating and integrity-checking a message.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="block-cipher">
+ <xs:annotation>
+ <xs:documentation>
+ A block cipher is a symmetric key algorithm that operates on fixed-size
+ blocks of data. It encrypts or decrypts the data in block units,
+ providing confidentiality. Block ciphers are widely used in various
+ cryptographic modes and protocols for secure data transmission.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="stream-cipher">
+ <xs:annotation>
+ <xs:documentation>
+ A stream cipher is a symmetric key cipher where plaintext digits are
+ combined with a pseudorandom cipher digit stream (keystream).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="signature">
+ <xs:annotation>
+ <xs:documentation>
+ In cryptography, a signature is a digital representation of a message
+ or data that proves its origin, identity, and integrity. Digital
+ signatures are generated using cryptographic algorithms and are widely
+ used for authentication and verification in secure communication.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="hash">
+ <xs:annotation>
+ <xs:documentation>
+ A hash function is a mathematical algorithm that takes an input
+ (or 'message') and produces a fixed-size string of characters, which is
+ typically a hash value. Hash functions are commonly used in various
+ cryptographic applications, including data integrity verification and
+ password hashing.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="pke">
+ <xs:annotation>
+ <xs:documentation>
+ Public Key Encryption (PKE) is a type of encryption that uses a pair of
+ public and private keys for secure communication. The public key is used
+ for encryption, while the private key is used for decryption. PKE is a
+ fundamental component of public-key cryptography.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="xof">
+ <xs:annotation>
+ <xs:documentation>
+ An XOF is an extendable output function that can take arbitrary input
+ and creates a stream of output, up to a limit determined by the size of
+ the internal state of the hash function that underlies the XOF.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="kdf">
+ <xs:annotation>
+ <xs:documentation>
+ A Key Derivation Function (KDF) derives key material from another source
+ of entropy while preserving the entropy of the input.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="key-agree">
+ <xs:annotation>
+ <xs:documentation>
+ In cryptography, a key-agreement is a protocol whereby two or more
+ parties agree on a cryptographic key in such a way that both influence
+ the outcome.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="kem">
+ <xs:annotation>
+ <xs:documentation>
+ A Key Encapsulation Mechanism (KEM) algorithm is a mechanism for
+ transporting random keying material to a recipient using the recipient's
+ public key.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="ae">
+ <xs:annotation>
+ <xs:documentation>
+ Authenticated Encryption (AE) is a cryptographic process that provides
+ both confidentiality and data integrity. It ensures that the encrypted
+ data has not been tampered with and comes from a legitimate source.
+ AE is commonly used in secure communication protocols.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="combiner">
+ <xs:annotation>
+ <xs:documentation>
+ A combiner aggregates many candidates for a cryptographic primitive and
+ generates a new candidate for the same primitive.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>
+ Another primitive type.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unknown">
+ <xs:annotation>
+ <xs:documentation>
+ The primitive is not known.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="parameterSetIdentifier" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ An identifier for the parameter set of the cryptographic algorithm. Examples: in
+ AES128, '128' identifies the key length in bits, in SHA256, '256' identifies the
+ digest length, '128' in SHAKE128 identifies its maximum security level in bits, and
+ 'SHA2-128s' identifies a parameter set used in SLH-DSA (FIPS205).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="curve" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The specific underlying Elliptic Curve (EC) definition employed which is an indicator
+ of the level of security strength, performance and complexity. Absent an
+ authoritative source of curve names, CycloneDX recommends use of curve names as
+ defined at https://neuromancer.sk/std/, the source from which can be found at
+ https://github.com/J08nY/std-curves.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="executionEnvironment" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The target and execution environment in which the algorithm is implemented in.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="software-plain-ram">
+ <xs:annotation>
+ <xs:documentation>
+ A software implementation running in plain unencrypted RAM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="software-encrypted-ram">
+ <xs:annotation>
+ <xs:documentation>
+ A software implementation running in encrypted RAM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration><xs:enumeration value="software-tee">
+ <xs:annotation>
+ <xs:documentation>
+ A software implementation running in a trusted execution environment.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration><xs:enumeration value="hardware">
+ <xs:annotation>
+ <xs:documentation>
+ A hardware implementation.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration><xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>
+ Another implementation environment.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration><xs:enumeration value="unknown">
+ <xs:annotation>
+ <xs:documentation>
+ The execution environment is not known.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="implementationPlatform" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The target platform for which the algorithm is implemented. The implementation can
+ be 'generic', running on any platform or for a specific platform.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="generic"/>
+ <xs:enumeration value="x86_32"/>
+ <xs:enumeration value="x86_64"/>
+ <xs:enumeration value="armv7-a"/>
+ <xs:enumeration value="armv7-m"/>
+ <xs:enumeration value="armv8-a"/>
+ <xs:enumeration value="armv8-m"/>
+ <xs:enumeration value="armv9-a"/>
+ <xs:enumeration value="armv9-m"/>
+ <xs:enumeration value="s390x"/>
+ <xs:enumeration value="ppc64"/>
+ <xs:enumeration value="ppc64le"/>
+ <xs:enumeration value="other"/>
+ <xs:enumeration value="unknown"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="certificationLevel" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The certification that the implementation of the cryptographic algorithm has
+ received, if any. Certifications include revisions and levels of FIPS 140 or
+ Common Criteria of different Extended Assurance Levels (CC-EAL).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="none">
+ <xs:annotation>
+ <xs:documentation>
+ No certification obtained
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-1-l1">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-1 Level 1
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-1-l2">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-1 Level 2
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-1-l3">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-1 Level 3
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-1-l4">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-1 Level 4
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-2-l1">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-2 Level 1
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-2-l2">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-2 Level 2
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-2-l3">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-2 Level 3
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-2-l4">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-2 Level 4
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-3-l1">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-3 Level 1
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-3-l2">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-3 Level 2
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-3-l3">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-3 Level 3
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="fips140-3-l4">
+ <xs:annotation>
+ <xs:documentation>
+ FIPS 140-3 Level 4
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal1">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 1
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal1+">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 1 (Augmented)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal2">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 2
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal2+">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 2 (Augmented)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal3">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 3
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal3+">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 3 (Augmented)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal4">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 4
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal4+">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 4 (Augmented)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal5">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 5
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal5+">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 5 (Augmented)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal6">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 6
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal6+">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 6 (Augmented)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal7">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 7
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cc-eal7+">
+ <xs:annotation>
+ <xs:documentation>
+ Common Criteria - Evaluation Assurance Level 7 (Augmented)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>
+ Another certification
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unknown">
+ <xs:annotation>
+ <xs:documentation>
+ The certification level is not known
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="mode" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The mode of operation in which the cryptographic algorithm (block cipher) is used.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="cbc">
+ <xs:annotation>
+ <xs:documentation>
+ Cipher block chaining
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="ecb">
+ <xs:annotation>
+ <xs:documentation>
+ Electronic codebook
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="ccm">
+ <xs:annotation>
+ <xs:documentation>
+ Counter with cipher block chaining message authentication code
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="gcm">
+ <xs:annotation>
+ <xs:documentation>
+ Galois/counter
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="cfb">
+ <xs:annotation>
+ <xs:documentation>
+ Cipher feedback
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="ofb">
+ <xs:annotation>
+ <xs:documentation>
+ Output feedback
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="ctr">
+ <xs:annotation>
+ <xs:documentation>
+ Counter
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>
+ Another mode of operation
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unknown">
+ <xs:annotation>
+ <xs:documentation>
+ The mode of operation is not known
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="padding" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The padding scheme that is used for the cryptographic algorithm.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="pkcs5">
+ <xs:annotation>
+ <xs:documentation>
+ Password-Based Cryptography Specification #5
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="pkcs7">
+ <xs:annotation>
+ <xs:documentation>
+ Public Key Cryptography Standard: Cryptographic Message Syntax
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="pkcs1v15">
+ <xs:annotation>
+ <xs:documentation>
+ Public Key Cryptography Standard: RSA Cryptography v1.5
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="oaep">
+ <xs:annotation>
+ <xs:documentation>
+ Optimal asymmetric encryption padding
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="raw">
+ <xs:annotation>
+ <xs:documentation>
+ Raw
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>
+ Another padding scheme
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unknown">
+ <xs:annotation>
+ <xs:documentation>
+ The padding scheme is not known
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="cryptoFunctions" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The cryptographic functions implemented by the cryptographic algorithm.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="cryptoFunction" minOccurs="0" maxOccurs="unbounded">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="generate"/>
+ <xs:enumeration value="keygen"/>
+ <xs:enumeration value="encrypt"/>
+ <xs:enumeration value="decrypt"/>
+ <xs:enumeration value="digest"/>
+ <xs:enumeration value="tag"/>
+ <xs:enumeration value="keyderive"/>
+ <xs:enumeration value="sign"/>
+ <xs:enumeration value="verify"/>
+ <xs:enumeration value="encapsulate"/>
+ <xs:enumeration value="decapsulate"/>
+ <xs:enumeration value="other"/>
+ <xs:enumeration value="unknown"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="classicalSecurityLevel" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The classical security level that a cryptographic algorithm provides (in bits).
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:minInclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="nistQuantumSecurityLevel" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The NIST security strength category as defined in
+ https://csrc.nist.gov/projects/post-quantum-cryptography/post-quantum-cryptography-standardization/evaluation-criteria/security-(evaluation-criteria).
+ A value of 0 indicates that none of the categories are met.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:minInclusive value="0"/>
+ <xs:maxInclusive value="6"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="certificateProperties" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Properties for cryptographic assets of asset type 'certificate'
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="subjectName" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The subject name for the certificate
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="issuerName" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The issuer name for the certificate
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="notValidBefore" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time according to ISO-8601 standard from which the certificate is valid
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="notValidAfter" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time according to ISO-8601 standard from which the certificate is not valid anymore
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="signatureAlgorithmRef" type="bom:refType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The bom-ref to signature algorithm used by the certificate
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="subjectPublicKeyRef" type="bom:refType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The bom-ref to the public key of the subject
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="certificateFormat" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The format of the certificate. Examples include X.509, PEM, DER, and CVC
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="certificateExtension" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The file extension of the certificate. Examples include crt, pem, cer, der, and p12.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="relatedCryptoMaterialProperties" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Properties for cryptographic assets of asset type 'relatedCryptoMaterial'
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="type" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The type for the related cryptographic material
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="private-key"/>
+ <xs:enumeration value="public-key"/>
+ <xs:enumeration value="secret-key"/>
+ <xs:enumeration value="key"/>
+ <xs:enumeration value="ciphertext"/>
+ <xs:enumeration value="signature"/>
+ <xs:enumeration value="digest"/>
+ <xs:enumeration value="initialization-vector"/>
+ <xs:enumeration value="nonce"/>
+ <xs:enumeration value="seed"/>
+ <xs:enumeration value="salt"/>
+ <xs:enumeration value="shared-secret"/>
+ <xs:enumeration value="tag"/>
+ <xs:enumeration value="additional-data"/>
+ <xs:enumeration value="password"/>
+ <xs:enumeration value="credential"/>
+ <xs:enumeration value="token"/>
+ <xs:enumeration value="other"/>
+ <xs:enumeration value="unknown"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="id" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The optional unique identifier for the related cryptographic material.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="state" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The key state as defined by NIST SP 800-57.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="pre-activation"/>
+ <xs:enumeration value="active"/>
+ <xs:enumeration value="suspended"/>
+ <xs:enumeration value="deactivated"/>
+ <xs:enumeration value="compromised"/>
+ <xs:enumeration value="destroyed"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="algorithmRef" type="bom:refType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The bom-ref to the algorithm used to generate the related cryptographic material.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="creationDate" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time (timestamp) when the related cryptographic material was created.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="activationDate" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time (timestamp) when the related cryptographic material was activated.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="updateDate" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time (timestamp) when the related cryptographic material was updated.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="expirationDate" type="xs:dateTime" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The date and time (timestamp) when the related cryptographic material expires.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The associated value of the cryptographic material.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="size" type="xs:integer" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The size of the cryptographic asset (in bits).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="format" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The format of the related cryptographic material (e.g. P8, PEM, DER).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="securedBy" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The mechanism by which the cryptographic asset is secured by.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="mechanism" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the mechanism by which the cryptographic asset is secured by.
+ Examples include HSM, TPM, XGX, Software, and None.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="algorithmRef" type="bom:refType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The bom-ref to the algorithm.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="protocolProperties" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Properties specific to cryptographic assets of type: 'protocol'.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="type" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The concrete protocol type.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="tls">
+ <xs:annotation>
+ <xs:documentation>
+ Transport Layer Security
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="ssh">
+ <xs:annotation>
+ <xs:documentation>
+ Secure Shell
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="ipsec">
+ <xs:annotation>
+ <xs:documentation>
+ Internet Protocol Security
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="ike">
+ <xs:annotation>
+ <xs:documentation>
+ Internet Key Exchange
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="sstp">
+ <xs:annotation>
+ <xs:documentation>
+ Secure Socket Tunneling Protocol
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="wpa">
+ <xs:annotation>
+ <xs:documentation>
+ Wi-Fi Protected Access
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="other">
+ <xs:annotation>
+ <xs:documentation>
+ Another protocol type
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unknown">
+ <xs:annotation>
+ <xs:documentation>
+ The protocol type is not known
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="version" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The version of the protocol. Examples include 1.0, 1.2, and 1.99.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="cipherSuites" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A list of cipher suites related to the protocol.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="cipherSuite" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A common name for the cipher suite. For example: TLS_DHE_RSA_WITH_AES_128_CCM
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="algorithms" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A list of algorithms related to the cipher suite.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="algorithm" type="bom:refType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The bom-ref to algorithm cryptographic asset.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="identifiers" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A list of common identifiers for the cipher suite.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="identifier" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Cipher suite identifier. Examples include 0xC0 and 0x9E.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ikev2TransformTypes" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The IKEv2 transform types supported (types 1-4), defined in RFC7296 section 3.3.2,
+ and additional properties.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="encr" type="bom:refType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Transform Type 1: encryption algorithms
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="prf" type="bom:refType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Transform Type 2: pseudorandom functions
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="integ" type="bom:refType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Transform Type 3: integrity algorithms
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ke" type="bom:refType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Transform Type 4: Key Exchange Method (KE) per RFC9370, formerly called Diffie-Hellman Group (D-H)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="esn" type="xs:boolean" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies if an Extended Sequence Number (ESN) is used.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="auth" type="bom:refType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ IKEv2 Authentication method
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="cryptoRef" type="bom:refType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>A protocol-related cryptographic assets</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="oid" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The object identifier (OID) of the cryptographic asset.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="declarationsType">
+ <xs:sequence>
+ <xs:element name="assessors" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of assessors evaluating claims and determining conformance to requirements and confidence in that assessment.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="assessor" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The assessor who evaluates claims and determines conformance to requirements and confidence in that assessment.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="thirdParty" type="xs:boolean" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The boolean indicating if the assessor is outside the organization generating claims. A value of false indicates a self assessor.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="organization" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The entity issuing the assessment.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the object elsewhere in the BOM.
+ Every bom-ref MUST be unique within the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="attestations" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of attestations asserted by an assessor that maps requirements to claims.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="attestation" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ An attestation asserted by an assessor that maps requirements to claims.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="summary" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The short description explaining the main points of the attestation.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="assessor" type="bom:refLinkType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The `bom-ref` to the assessor asserting the attestation.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="map" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The grouping of requirements to claims and the attestors declared conformance and confidence thereof.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="requirement" type="bom:refLinkType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The `bom-ref` to the requirement being attested to.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="claims" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of `bom-ref` to the claims being attested to.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="claim" type="bom:refLinkType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The `bom-ref` to the claim being attested to.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="counterClaims" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of `bom-ref` to the counter claims being attested to.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="counterClaim" type="bom:refLinkType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The `bom-ref` to the counter claim being attested to.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="conformance" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The conformance of the claim meeting a requirement.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="score">
+ <xs:annotation>
+ <xs:documentation>
+ The conformance of the claim between and inclusive of 0 and 1, where 1 is 100% conformance.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:decimal">
+ <xs:minInclusive value="0"/>
+ <xs:maxInclusive value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="rationale" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The rationale for the score of conformance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="mitigationStrategies" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of `bom-ref` to the evidence provided describing the
+ mitigation strategies. Each mitigation strategy should include an
+ explanation of how any weaknesses in the evidence will be mitigated.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="mitigationStrategy" type="bom:refLinkType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="confidence" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The confidence of the claim meeting the requirement.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="score">
+ <xs:annotation>
+ <xs:documentation>
+ The confidence of the claim between and inclusive of 0 and 1, where 1 is 100% confidence.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:decimal">
+ <xs:minInclusive value="0"/>
+ <xs:maxInclusive value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="rationale" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The rationale for the confidence score.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="claims" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of claims.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="claim" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="target" type="bom:refLinkType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The `bom-ref` to a target representing a specific system, application,
+ API, module, team, person, process, business unit, company, etc...
+ that this claim is being applied to.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="predicate" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The specific statement or assertion about the target.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="mitigationStrategies" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of `bom-ref` to the evidence provided describing the
+ mitigation strategies. Each mitigation strategy should include an
+ explanation of how any weaknesses in the evidence will be mitigated.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="mitigationStrategy" type="bom:refLinkType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="reasoning" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The written explanation of why the evidence provided substantiates the claim.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="evidence" type="bom:refLinkType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The list of `bom-ref` to evidence that supports this claim.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="counterEvidence" type="bom:refLinkType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The list of `bom-ref` to counterEvidence that supports this claim.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="externalReferences" type="bom:externalReferences" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document external references related to the claim the BOM describes.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the object elsewhere
+ in the BOM. Every bom-ref MUST be unique within the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="evidence" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of evidence
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="evidence" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The list of evidence
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="propertyName" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The reference to the property name as defined in the [CycloneDX Property Taxonomy](https://github.com/CycloneDX/cyclonedx-property-taxonomy/).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The written description of what this evidence is and how it was created.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="data" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The output or analysis that supports claims.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the data.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="contents" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The contents or references to the contents of the data being described.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="attachment" type="bom:attachedTextType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>An optional way to include textual or encoded data.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="url" type="xs:anyURI" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The URL to where the data can be retrieved.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="classification" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ Data classification tags data according to its type, sensitivity, and value if altered, stolen, or destroyed.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="sensitiveData" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ A description of any sensitive data.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="governance" type="bom:dataGovernance" minOccurs="0" maxOccurs="1" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="created" type="xs:dateTime" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The date and time (timestamp) when the evidence was created.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="expires" type="xs:dateTime" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The optional date and time (timestamp) when the evidence is no longer valid.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="author" type="bom:organizationalContact" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The author of the evidence.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="reviewer" type="bom:organizationalContact" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The reviewer of the evidence.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the object elsewhere
+ in the BOM. Every bom-ref MUST be unique within the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="targets" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of targets which claims are made against.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="organizations" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of organizations which claims are made against.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="organization" type="bom:organizationalEntity" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="components" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of components which claims are made against.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="component" type="bom:component" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="services" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of services which claims are made against.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="service" type="bom:service" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="affirmation" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="statement" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The brief statement affirmed by an individual regarding all declarations.
+ This could be an affirmation of acceptance by a third-party auditor or receiving
+ individual of a file. For example: "I certify, to the best of my knowledge, that all information is correct."
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="signatories" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of signatories authorized on behalf of an organization to assert validity of this document.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="signatory" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The signatory's name.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="role" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The signatory's role within an organization.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="organization" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The signatory's organization.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="externalReference" type="bom:externalReference" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ An External reference provide a way to document systems, sites, and information that may be relevant, but are not included with the BOM. They may also establish specific relationships within or external to the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="definitionsType">
+ <xs:annotation>
+ <xs:documentation>
+ A collection of reusable objects that are defined and may be used elsewhere in the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="standards" type="bom:standardsType" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="standardsType">
+ <xs:annotation>
+ <xs:documentation>
+ The list of standards which may consist of regulations, industry or organizational-specific standards, maturity models, best practices, or any other requirements which can be evaluated against or attested to.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="standard" type="bom:standard"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="standard">
+ <xs:annotation>
+ <xs:documentation>
+ A standard may consist of regulations, industry or organizational-specific standards, maturity models, best practices, or any other requirements which can be evaluated against or attested to.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>
+ The name of the standard. This will often be a shortened, single name of the standard.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="version" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>
+ The version of the standard.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>
+ The description of the standard.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="owner" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>
+ The owner of the standard, often the entity responsible for its release.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="requirements" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of requirements comprising the standard.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="requirement" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="identifier" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The unique identifier used in the standard to identify a specific requirement. This should match what is in the standard and should not be the requirements bom-ref.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The title of the requirement.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="text" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The textual content of the requirement.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="descriptions" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The supplemental text that provides additional guidance or context to the requirement, but is not directly part of the requirement.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="openCre" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ The Common Requirements Enumeration (CRE) identifier(s). CRE is a structured and standardized framework for uniting security standards and guidelines. CRE links each section of a resource to a shared topic identifier (a Common Requirement). Through this shared topic link, all resources map to each other. Use of CRE promotes clear and unambiguous communication among stakeholders.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="CRE:[0-9]+-[0-9]+"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="parent" type="bom:refLinkType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The optional `bom-ref` to a parent requirement. This establishes a hierarchy of requirements. Top-level requirements must not define a parent. Only child requirements should define parents.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="externalReferences" type="bom:externalReferences" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document external references related to the BOM or
+ to the project the BOM describes.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the object elsewhere
+ in the BOM. Every bom-ref MUST be unique within the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="levels" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of levels associated with the standard. Some standards have different levels of compliance.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="level" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="identifier" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The identifier used in the standard to identify a specific level.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The title of the level.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The description of the level.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="requirements" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of requirement `bom-ref`s that comprise the level.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="requirement" type="bom:refLinkType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the object elsewhere
+ in the BOM. Every bom-ref MUST be unique within the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="externalReferences" type="bom:externalReferences" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document external references related to the BOM or
+ to the project the BOM describes.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:annotation>
+ <xs:documentation>
+ An optional identifier which can be used to reference the object elsewhere
+ in the BOM. Every bom-ref MUST be unique within the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+ <xs:complexType name="tagsType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="tag" type="xs:normalizedString">
+ <xs:annotation>
+ <xs:documentation>Textual strings that aid in discovery, search, and retrieval of the associated
+ object. Tags often serve as a way to group or categorize similar or related objects by various
+ attributes.
+
+ Examples include:
+ "json-parser", "object-persistence", "text-to-image", "translation", and "object-detection"
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="bom">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="metadata" type="bom:metadata" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides additional information about a BOM.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="components" type="bom:componentsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A list of software and hardware components.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="services" type="bom:servicesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A list of services. This may include microservices, function-as-a-service, and other types of network or intra-process services.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="externalReferences" type="bom:externalReferences" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document external references related to the BOM or
+ to the project the BOM describes.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="dependencies" type="bom:dependenciesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document dependency relationships.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="compositions" type="bom:compositionsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Compositions describe constituent parts (including components, services, and dependency relationships) and their completeness. The completeness of vulnerabilities expressed in a BOM may also be described.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Provides the ability to document properties in a name/value store.
+ This provides flexibility to include data not officially supported in the standard
+ without having to use additional namespaces or create extensions. Property names
+ of interest to the general public are encouraged to be registered in the
+ CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
+ Formal registration is OPTIONAL.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="vulnerabilities" type="bom:vulnerabilitiesType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Vulnerabilities identified in components or services.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="annotations" type="bom:annotationsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Comments made by people, organizations, or tools about any object with
+ a bom-ref, such as components, services, vulnerabilities, or the BOM itself. Unlike
+ inventory information, annotations may contain opinion or commentary from various
+ stakeholders. Annotations may be inline (with inventory) or externalized via BOM-Link,
+ and may optionally be signed.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="formulation" type="bom:formulationType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Describes how a component or service was manufactured or deployed. This is
+ achieved through the use of formulas, workflows, tasks, and steps, which declare the precise
+ steps to reproduce along with the observed formulas describing the steps which transpired
+ in the manufacturing process.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="declarations" type="bom:declarationsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The list of declarations which describe the conformance to standards. Each declaration may
+ include attestations, claims, and evidence.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="definitions" type="bom:definitionsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A collection of reusable objects that are defined and may be used elsewhere in the BOM.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Allows any undeclared elements as long as the elements are placed in a different namespace.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="version" type="xs:positiveInteger" default="1">
+ <xs:annotation>
+ <xs:documentation>Whenever an existing BOM is modified, either manually or through automated
+ processes, the version of the BOM SHOULD be incremented by 1. When a system is presented with
+ multiple BOMs with identical serial numbers, the system SHOULD use the most recent version of the BOM.
+ The default version is '1'.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="serialNumber" type="bom:urnUuid">
+ <xs:annotation>
+ <xs:documentation>Every BOM generated SHOULD have a unique serial number, even if the contents of
+ the BOM have not changed over time. If specified, the serial number MUST conform to RFC-4122.
+ Use of serial numbers are RECOMMENDED.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>User-defined attributes may be used on this element as long as they
+ do not have the same name as an existing attribute used by the schema.</xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+ <xs:unique name="bom-ref">
+ <xs:selector xpath=".//*"/>
+ <xs:field xpath="@bom-ref"/>
+ </xs:unique>
+ </xs:element>
+</xs:schema>
From 7cc2dee7362bd29f648397f18e891e3e07a4f58d Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Wed, 4 Sep 2024 15:27:05 +0200
Subject: [PATCH 02/42] carry over of latest master
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.proto | 35 +++++------
schema/bom-1.7.schema.json | 2 +-
schema/bom-1.7.xsd | 122 ++++++++++++++++++++-----------------
3 files changed, 84 insertions(+), 75 deletions(-)
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index 94c5ac28..df86a870 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -106,7 +106,7 @@ message Component {
optional string group = 7;
// The name of the component. This will often be a shortened, single name of the component. Examples: commons-lang3 and jquery
string name = 8;
- // The component version. The version should ideally comply with semantic versioning but is not enforced. Version was made optional in v1.4 of the spec. For backward compatibility, it is RECOMMENDED to use an empty string to represent components without version information.
+ // The component version. The version should ideally comply with semantic versioning but is not enforced. Version was made optional in v1.4 of the spec. For backward compatibility, it is recommended to use an empty string to represent components without version information.
string version = 9;
// Specifies a description for the component
optional string description = 10;
@@ -134,12 +134,12 @@ message Component {
// Specifies optional, custom, properties
repeated Property properties = 22;
// Specifies optional license and copyright evidence
- optional Evidence evidence = 23;
+ repeated Evidence evidence = 23;
// Specifies optional release notes.
optional ReleaseNotes releaseNotes = 24;
// A model card describes the intended uses of a machine learning model, potential limitations, biases, ethical considerations, training parameters, datasets used to train the model, performance metrics, and other relevant data useful for ML transparency.
optional ModelCard modelCard = 25;
- // This object SHOULD be specified for any component of type `data` and MUST NOT be specified for other component types.
+ // This object SHOULD be specified for any component of type `data` and must not be specified for other component types.
optional ComponentData data = 26;
// Cryptographic assets have properties that uniquely define them and that make them actionable for further reasoning. As an example, it makes a difference if one knows the algorithm family (e.g. AES) or the specific variant or instantiation (e.g. AES-128-GCM). This is because the security level and the algorithm primitive (authenticated encryption) is only defined by the definition of the algorithm variant. The presence of a weak cryptographic algorithm like SHA1 vs. HMAC-SHA1 also makes a difference.
optional CryptoProperties cryptoProperties = 27;
@@ -149,9 +149,9 @@ message Component {
repeated OrganizationalContact authors = 29;
// Textual strings that aid in discovery, search, and retrieval of the associated object. Tags often serve as a way to group or categorize similar or related objects by various attributes. Examples include "json-parser", "object-persistence", "text-to-image", "translation", and "object-detection".
repeated string tags = 30;
- // Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, MUST be valid and conform to the specification defined at: https://www.iana.org/assignments/uri-schemes/prov/gitoid
+ // Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, must be valid and conform to the specification defined at: https://www.iana.org/assignments/uri-schemes/prov/gitoid
repeated string omniborId = 31;
- // Specifies the Software Heritage persistent identifier (SWHID). The SWHID, if specified, MUST be valid and conform to the specification defined at: https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html
+ // Specifies the Software Heritage persistent identifier (SWHID). The SWHID, if specified, must be valid and conform to the specification defined at: https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html
repeated string swhid = 32;
}
@@ -279,7 +279,7 @@ enum ExternalReferenceType {
EXTERNAL_REFERENCE_TYPE_CODIFIED_INFRASTRUCTURE = 31;
// A model card describes the intended uses of a machine learning model, potential limitations, biases, ethical considerations, training parameters, datasets used to train the model, performance metrics, and other relevant data useful for ML transparency.
EXTERNAL_REFERENCE_TYPE_MODEL_CARD = 32;
- // Plans of Action and Milestones (POAM) complement an "attestation" external reference. POAM is defined by NIST as a "document that identifies tasks needing to be accomplished. It details resources required to accomplish the elements of the plan, any milestones in meeting the tasks and scheduled completion dates for the milestones".
+ // Plans of Action and Milestones (POA&M) complement an "attestation" external reference. POA&M is defined by NIST as a "document that identifies tasks needing to be accomplished. It details resources required to accomplish the elements of the plan, any milestones in meeting the tasks and scheduled completion dates for the milestones".
EXTERNAL_REFERENCE_TYPE_POAM = 33;
// A record of events that occurred in a computer system or application, such as problems, errors, or information on current operations.
EXTERNAL_REFERENCE_TYPE_LOG = 34;
@@ -375,11 +375,12 @@ message LicenseChoice {
optional LicenseAcknowledgementEnumeration acknowledgement = 3;
}
+// Specifies the details and attributes related to a software license. It can either include a valid SPDX license identifier or a named license, along with additional properties such as license acknowledgment, comprehensive commercial licensing information, and the full text of the license.
message License {
oneof license {
- // A valid SPDX license ID
+ // A valid SPDX license identifier. If specified, this value must be one of the enumeration of valid SPDX license identifiers defined in the spdx.schema.json (or spdx.xml) subschema which is synchronized with the official SPDX license list.
string id = 1;
- // If SPDX does not define the license used, this field may be used to provide the license name
+ // The name of the license. This may include the name of a commercial or proprietary license or an open source license that may not be defined by SPDX.
string name = 2;
}
// Specifies the optional full text of the attachment
@@ -704,7 +705,7 @@ message Composition {
repeated string dependencies = 3;
// The bom-ref identifiers of the vulnerabilities being described.
repeated string vulnerabilities = 4;
- // An optional identifier which can be used to reference the composition elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ // An optional identifier which can be used to reference the composition elsewhere in the BOM. Every bom-ref must be unique within the BOM.
optional string bom_ref = 5;
}
@@ -767,7 +768,7 @@ message EvidenceMethods {
}
message EvidenceOccurrences {
- // An optional identifier which can be used to reference the occurrence elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ // An optional identifier which can be used to reference the occurrence elsewhere in the BOM. Every bom-ref must be unique within the BOM.
optional string bom_ref = 1;
// The location or path to where the component was found.
string location = 2;
@@ -818,7 +819,7 @@ message Note {
}
message ReleaseNotes {
- // The software versioning type. It is RECOMMENDED that the release type use one of 'major', 'minor', 'patch', 'pre-release', or 'internal'. Representing all possible software release types is not practical, so standardizing on the recommended values, whenever possible, is strongly encouraged.
+ // The software versioning type. It is recommended that the release type use one of 'major', 'minor', 'patch', 'pre-release', or 'internal'. Representing all possible software release types is not practical, so standardizing on the recommended values, whenever possible, is strongly encouraged.
string type = 1;
// The title of the release.
optional string title = 2;
@@ -1072,7 +1073,7 @@ message AnnotatorChoice {
}
message Annotation {
- // An optional identifier which can be used to reference the annotation elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ // An optional identifier which can be used to reference the annotation elsewhere in the BOM. Every bom-ref must be unique within the BOM.
optional string bom_ref = 1;
// The object in the BOM identified by its bom-ref. This is often a component or service but may be any object type supporting bom-refs.
repeated string subjects = 2;
@@ -1085,7 +1086,7 @@ message Annotation {
}
message ModelCard {
- // An optional identifier which can be used to reference the model card elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ // An optional identifier which can be used to reference the model card elsewhere in the BOM. Every bom-ref must be unique within the BOM.
optional string bom_ref = 1;
// Hyper-parameters for construction of the model.
optional ModelParameters modelParameters = 2;
@@ -1302,7 +1303,7 @@ message CO2MeasureType {
// An address used to identify a contactable location.
message PostalAddressType {
- // An optional identifier which can be used to reference the address elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ // An optional identifier which can be used to reference the address elsewhere in the BOM. Every bom-ref must be unique within the BOM.
optional string bom_ref = 1;
// The country name or the two-letter ISO 3166-1 country code.
optional string country = 2;
@@ -1333,7 +1334,7 @@ enum ModelParameterApproachType {
}
message ComponentData {
- // An optional identifier which can be used to reference the dataset elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
+ // An optional identifier which can be used to reference the dataset elsewhere in the BOM. Every bom-ref must be unique within the BOM.
optional string bom_ref = 1;
// The general theme or subject matter of the data being specified.
ComponentDataType type = 2;
@@ -1401,7 +1402,7 @@ message GraphicsCollection {
message Graphic {
// The name of the graphic.
optional string name = 1;
- // The graphic (vector or raster). Base64 encoding MUST be specified for binary images.
+ // The graphic (vector or raster). Base64 encoding must be specified for binary images.
optional AttachedText image = 2;
}
}
@@ -1592,7 +1593,7 @@ message Trigger {
TriggerType type = 7;
// The event data that caused the associated trigger to activate.
optional Event event = 8;
- // Conditions
+ // A list of conditions used to determine if a trigger should be activated.
repeated Condition conditions = 9;
// The date and time (timestamp) when the trigger was activated.
optional google.protobuf.Timestamp timeActivated = 10;
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index b7c7212a..6adf03a2 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -1161,7 +1161,7 @@
"contentType": {
"type": "string",
"title": "Content-Type",
- "description": "Specifies the format and nature of the data being attached, helping systems correctly interpret and process the content. Common content type examples include `application/json` for JSON data and `text/plain` for plan text documents. [RFC 2045 section 5.1](https://www.ietf.org/rfc/rfc2045.html#section-5.1) outlines the structure and use of content types. For a comprehensive list of registered content types, refer to the [IANA media types registry](https://www.iana.org/assignments/media-types/media-types.xhtml).",
+ "description": "Specifies the format and nature of the data being attached, helping systems correctly interpret and process the content. Common content type examples include `application/json` for JSON data and `text/plain` for plan text documents.\n [RFC 2045 section 5.1](https://www.ietf.org/rfc/rfc2045.html#section-5.1) outlines the structure and use of content types. For a comprehensive list of registered content types, refer to the [IANA media types registry](https://www.iana.org/assignments/media-types/media-types.xhtml).",
"default": "text/plain",
"examples": [
"text/plain",
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 32683406..00d98963 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -253,7 +253,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
@@ -581,8 +581,7 @@ limitations under the License.
<xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1"/>
<xs:element name="copyright" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
<xs:annotation>
- <xs:documentation>A copyright notice informing users of the underlying claims to
- copyright ownership in a published work.</xs:documentation>
+ <xs:documentation>A copyright notice informing users of the underlying claims to copyright ownership in a published work.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="cpe" type="bom:cpe" minOccurs="0" maxOccurs="1">
@@ -595,7 +594,7 @@ limitations under the License.
<xs:element name="purl" type="xs:anyURI" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
- Specifies the package-url (purl). The purl, if specified, MUST be valid and conform
+ Specifies the package-url (purl). The purl, if specified, must be valid and conform
to the specification defined at: https://github.com/package-url/purl-spec
</xs:documentation>
</xs:annotation>
@@ -603,7 +602,7 @@ limitations under the License.
<xs:element name="omniborId" type="xs:string" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
- Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, MUST be valid and conform
+ Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, must be valid and conform
to the specification defined at: https://www.iana.org/assignments/uri-schemes/prov/gitoid
</xs:documentation>
</xs:annotation>
@@ -611,7 +610,7 @@ limitations under the License.
<xs:element name="swhid" type="xs:string" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
- Specifies the Software Heritage persistent identifier (SWHID). The SWHID, if specified, MUST
+ Specifies the Software Heritage persistent identifier (SWHID). The SWHID, if specified, must
be valid and conform to the specification defined at:
https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html
</xs:documentation>
@@ -656,7 +655,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="components" minOccurs="0" maxOccurs="1">
@@ -696,12 +695,12 @@ limitations under the License.
limitations, including biases and ethical considerations. Model cards typically contain the
training parameters, which datasets were used to train the model, performance metrics, and other
relevant data useful for ML transparency. This object SHOULD be specified for any component of
- type `machine-learning-model` and MUST NOT be specified for other component types.</xs:documentation>
+ type `machine-learning-model` and must not be specified for other component types.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="data" type="bom:componentDataType" minOccurs="0" maxOccurs="1">
<xs:annotation>
- <xs:documentation>This object SHOULD be specified for any component of type `data` and MUST NOT be
+ <xs:documentation>This object SHOULD be specified for any component of type `data` and must not be
specified for other component types.</xs:documentation>
</xs:annotation>
</xs:element>
@@ -737,7 +736,7 @@ limitations under the License.
<xs:attribute name="mime-type" type="bom:mimeType">
<xs:annotation>
<xs:documentation>
- The OPTIONAL mime-type of the component. When used on file components, the mime-type
+ The optional mime-type of the component. When used on file components, the mime-type
can provide additional context about the kind of file being represented such as an image,
font, or executable. Some library or framework components may also have an associated mime-type.
</xs:documentation>
@@ -760,16 +759,22 @@ limitations under the License.
</xs:complexType>
<xs:complexType name="licenseType">
+ <xs:annotation>
+ <xs:documentation>Specifies the details and attributes related to a software license.
+ It can either include a valid SPDX license identifier or a named license, along with additional
+ properties such as license acknowledgment, comprehensive commercial licensing information, and
+ the full text of the license.</xs:documentation>
+ </xs:annotation>
<xs:sequence>
<xs:choice>
<xs:element name="id" type="spdx:licenseId" minOccurs="1" maxOccurs="1">
<xs:annotation>
- <xs:documentation>A valid SPDX license ID</xs:documentation>
+ <xs:documentation>A valid SPDX license identifier. If specified, this value must be one of the enumeration of valid SPDX license identifiers defined in the spdx.schema.json (or spdx.xml) subschema which is synchronized with the official SPDX license list.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="name" type="xs:normalizedString" minOccurs="1" maxOccurs="1">
<xs:annotation>
- <xs:documentation>If SPDX does not define the license used, this field may be used to provide the license name</xs:documentation>
+ <xs:documentation>The name of the license. This may include the name of a commercial or proprietary license or an open source license that may not be defined by SPDX.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:choice>
@@ -916,7 +921,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
@@ -966,10 +971,10 @@ limitations under the License.
Specifies the format and nature of the data being attached, helping systems correctly
interpret and process the content. Common content type examples include `application/json`
for JSON data and `text/plain` for plan text documents.
-
RFC 2045 section 5.1 outlines the structure and use of content types. For a comprehensive
list of registered content types, refer to the IANA media types registry at
- https://www.iana.org/assignments/media-types/media-types.xhtml.</xs:documentation>
+ https://www.iana.org/assignments/media-types/media-types.xhtml.
+ </xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="encoding" type="bom:encoding">
@@ -1519,7 +1524,7 @@ limitations under the License.
</xs:enumeration>
<xs:enumeration value="poam">
<xs:annotation>
- <xs:documentation>Plans of Action and Milestones (POAM) complement an "attestation" external reference. POAM is defined by NIST as a "document that identifies tasks needing to be accomplished. It details resources required to accomplish the elements of the plan, any milestones in meeting the tasks and scheduled completion dates for the milestones".</xs:documentation>
+ <xs:documentation>Plans of Action and Milestones (POA&M) complement an "attestation" external reference. POA&M is defined by NIST as a "document that identifies tasks needing to be accomplished. It details resources required to accomplish the elements of the plan, any milestones in meeting the tasks and scheduled completion dates for the milestones".</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="electronic-signature">
@@ -1993,10 +1998,10 @@ limitations under the License.
<xs:element name="dependency" type="bom:dependencyType">
<xs:annotation>
<xs:documentation>Defines the direct dependencies of a component or service. Components or services
- that do not have their own dependencies MUST be declared as empty elements within the graph.
- Components or services that are not represented in the dependency graph MAY have unknown
- dependencies. It is RECOMMENDED that implementations assume this to be opaque and not an
- indicator of a object being dependency-free. It is RECOMMENDED to leverage compositions to
+ that do not have their own dependencies must be declared as empty elements within the graph.
+ Components or services that are not represented in the dependency graph may have unknown
+ dependencies. It is recommended that implementations assume this to be opaque and not an
+ indicator of a object being dependency-free. It is recommended to leverage compositions to
indicate unknown dependency graphs.</xs:documentation>
</xs:annotation>
</xs:element>
@@ -2171,7 +2176,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="services" minOccurs="0" maxOccurs="1">
@@ -2431,7 +2436,7 @@ limitations under the License.
<xs:annotation>
<xs:documentation>Evidence that substantiates the identity of a component. The identify may be an
object or an array of identity objects. Support for specifying identity as a single object was
- introduced in CycloneDX v1.5. "unbounded" was introduced in v1.6. It is RECOMMENDED that all
+ introduced in CycloneDX v1.5. "unbounded" was introduced in v1.6. It is recommended that all
implementations are aware of "unbounded".</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -2538,7 +2543,7 @@ limitations under the License.
<xs:annotation>
<xs:documentation>
An optional identifier which can be used to reference the occurrence elsewhere
- in the BOM. Every bom-ref MUST be unique within the BOM.
+ in the BOM. Every bom-ref must be unique within the BOM.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -2798,8 +2803,8 @@ limitations under the License.
<xs:annotation>
<xs:documentation xml:lang="en">
Defines a syntax for representing two character language code (ISO-639) followed by an optional two
- character country code. The language code MUST be lower case. If the country code is specified, the
- country code MUST be upper case. The language code and country code MUST be separated by a minus sign.
+ character country code. The language code must be lower case. If the country code is specified, the
+ country code must be upper case. The language code and country code must be separated by a minus sign.
Examples: en, en-US, fr, fr-CA
</xs:documentation>
</xs:annotation>
@@ -2812,7 +2817,7 @@ limitations under the License.
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="type" type="xs:normalizedString" minOccurs="1" maxOccurs="1">
<xs:annotation>
- <xs:documentation>The software versioning type. It is RECOMMENDED that the release type use one
+ <xs:documentation>The software versioning type. It is recommended that the release type use one
of 'major', 'minor', 'patch', 'pre-release', or 'internal'. Representing all possible software
release types is not practical, so standardizing on the recommended values, whenever possible,
is strongly encouraged.
@@ -2908,7 +2913,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
@@ -2939,7 +2944,7 @@ limitations under the License.
A model card describes the intended uses of a machine learning model and potential limitations, including
biases and ethical considerations. Model cards typically contain the training parameters, which datasets
were used to train the model, performance metrics, and other relevant data useful for ML transparency.
- This object SHOULD be specified for any component of type `machine-learning-model` and MUST NOT be specified
+ This object SHOULD be specified for any component of type `machine-learning-model` and must not be specified
for other component types.
</xs:documentation>
</xs:annotation>
@@ -3167,7 +3172,7 @@ limitations under the License.
<xs:element name="image" type="bom:attachedTextType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
- The graphic (vector or raster). Base64 encoding MUST be specified for binary images.
+ The graphic (vector or raster). Base64 encoding must be specified for binary images.
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -3335,7 +3340,7 @@ limitations under the License.
<xs:annotation>
<xs:documentation>
An optional identifier which can be used to reference the model card elsewhere in the BOM.
- Every bom-ref MUST be unique within the BOM.
+ Every bom-ref must be unique within the BOM.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -3362,7 +3367,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.
+ Formal registration is optional.
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -3504,7 +3509,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.
+ Formal registration is optional.
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -3901,7 +3906,7 @@ limitations under the License.
<xs:annotation>
<xs:documentation>
An optional identifier which can be used to reference the dataset elsewhere in the BOM.
- Every bom-ref MUST be unique within the BOM.
+ Every bom-ref must be unique within the BOM.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -3990,7 +3995,7 @@ limitations under the License.
<xs:element name="image" type="bom:attachedTextType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
- The graphic (vector or raster). Base64 encoding MUST be specified for binary images.
+ The graphic (vector or raster). Base64 encoding must be specified for binary images.
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -4449,7 +4454,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
@@ -4931,7 +4936,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
@@ -5092,7 +5097,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
@@ -5314,7 +5319,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
@@ -5517,7 +5522,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
@@ -5618,7 +5623,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
@@ -5677,7 +5682,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
@@ -5693,7 +5698,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
@@ -5757,6 +5762,9 @@ limitations under the License.
</xs:annotation>
</xs:element>
<xs:element name="conditions" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>A list of conditions used to determine if a trigger should be activated.</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="condition" minOccurs="0" maxOccurs="unbounded">
@@ -5788,7 +5796,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
@@ -5835,7 +5843,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
@@ -5922,7 +5930,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
@@ -6010,7 +6018,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
@@ -6097,7 +6105,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
@@ -7365,7 +7373,7 @@ limitations under the License.
<xs:annotation>
<xs:documentation>
An optional identifier which can be used to reference the object elsewhere in the BOM.
- Every bom-ref MUST be unique within the BOM.
+ Every bom-ref must be unique within the BOM.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -7632,7 +7640,7 @@ limitations under the License.
<xs:annotation>
<xs:documentation>
An optional identifier which can be used to reference the object elsewhere
- in the BOM. Every bom-ref MUST be unique within the BOM.
+ in the BOM. Every bom-ref must be unique within the BOM.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -7763,7 +7771,7 @@ limitations under the License.
<xs:annotation>
<xs:documentation>
An optional identifier which can be used to reference the object elsewhere
- in the BOM. Every bom-ref MUST be unique within the BOM.
+ in the BOM. Every bom-ref must be unique within the BOM.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -8049,7 +8057,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="externalReferences" type="bom:externalReferences" minOccurs="0" maxOccurs="1">
@@ -8063,7 +8071,7 @@ limitations under the License.
<xs:annotation>
<xs:documentation>
An optional identifier which can be used to reference the object elsewhere
- in the BOM. Every bom-ref MUST be unique within the BOM.
+ in the BOM. Every bom-ref must be unique within the BOM.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -8127,7 +8135,7 @@ limitations under the License.
<xs:annotation>
<xs:documentation>
An optional identifier which can be used to reference the object elsewhere
- in the BOM. Every bom-ref MUST be unique within the BOM.
+ in the BOM. Every bom-ref must be unique within the BOM.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -8160,7 +8168,7 @@ limitations under the License.
<xs:annotation>
<xs:documentation>
An optional identifier which can be used to reference the object elsewhere
- in the BOM. Every bom-ref MUST be unique within the BOM.
+ in the BOM. Every bom-ref must be unique within the BOM.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -8229,7 +8237,7 @@ limitations under the License.
without having to use additional namespaces or create extensions. Property names
of interest to the general public are encouraged to be registered in the
CycloneDX Property Taxonomy - https://github.com/CycloneDX/cyclonedx-property-taxonomy.
- Formal registration is OPTIONAL.</xs:documentation>
+ Formal registration is optional.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="vulnerabilities" type="bom:vulnerabilitiesType" minOccurs="0" maxOccurs="1">
@@ -8288,8 +8296,8 @@ limitations under the License.
<xs:attribute name="serialNumber" type="bom:urnUuid">
<xs:annotation>
<xs:documentation>Every BOM generated SHOULD have a unique serial number, even if the contents of
- the BOM have not changed over time. If specified, the serial number MUST conform to RFC-4122.
- Use of serial numbers are RECOMMENDED.</xs:documentation>
+ the BOM have not changed over time. If specified, the serial number must conform to RFC-4122.
+ Use of serial numbers are recommended.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:anyAttribute namespace="##any" processContents="lax">
From efc7163955c522e097254a91c6014c2825b53940 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Wed, 4 Sep 2024 15:33:04 +0200
Subject: [PATCH 03/42] carry over of latest master
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.proto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index df86a870..d582e605 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -133,7 +133,7 @@ message Component {
repeated Component components = 21;
// Specifies optional, custom, properties
repeated Property properties = 22;
- // Specifies optional license and copyright evidence
+ // Specifies optional license and copyright evidence. Only the first item in the optional repeated list is to be taken into account; every other item in the list is to be ignored/omitted.
repeated Evidence evidence = 23;
// Specifies optional release notes.
optional ReleaseNotes releaseNotes = 24;
From 0cc2e3a4a47887dd5a59fbf3aa44e48bc31924e0 Mon Sep 17 00:00:00 2001
From: Dmitry Volk <volk.dmitry@gmail.com>
Date: Thu, 26 Sep 2024 16:40:28 +0300
Subject: [PATCH 04/42] Added support for STREEBOG-256 and STREEBOG-512 hashing
algorithms (#485)
Signed-off-by: Dmitry Volk <volk.dmitry@gmail.com>
---
schema/bom-1.7.proto | 2 ++
schema/bom-1.7.schema.json | 4 +++-
schema/bom-1.7.xsd | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index d582e605..142d9507 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -314,6 +314,8 @@ enum HashAlg {
HASH_ALG_BLAKE_2_B_384 = 10;
HASH_ALG_BLAKE_2_B_512 = 11;
HASH_ALG_BLAKE_3 = 12;
+ STREEBOG_256 = 13;
+ STREEBOG_512 = 14;
}
// Specifies the file hash of the component
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index 6adf03a2..12bbde25 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -1220,7 +1220,9 @@
"BLAKE2b-256",
"BLAKE2b-384",
"BLAKE2b-512",
- "BLAKE3"
+ "BLAKE3",
+ "STREEBOG-256",
+ "STREEBOG-512"
]
},
"hash-content": {
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 00d98963..761a9fbb 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -1131,6 +1131,8 @@ limitations under the License.
<xs:enumeration value="BLAKE2b-384"/>
<xs:enumeration value="BLAKE2b-512"/>
<xs:enumeration value="BLAKE3"/>
+ <xs:enumeration value="STREEBOG-256"/>
+ <xs:enumeration value="STREEBOG-512"/>
</xs:restriction>
</xs:simpleType>
From 1d0a1d5597d7a221dc70e4111ccc0ef6b293d213 Mon Sep 17 00:00:00 2001
From: Dmitry Volk <volk.dmitry@gmail.com>
Date: Thu, 26 Sep 2024 17:59:03 +0300
Subject: [PATCH 05/42] Add "HASH_ALG_" prefix to algorithm name
Signed-off-by: Dmitry Volk <volk.dmitry@gmail.com>
---
schema/bom-1.7.proto | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index 142d9507..f795f1d6 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -314,8 +314,8 @@ enum HashAlg {
HASH_ALG_BLAKE_2_B_384 = 10;
HASH_ALG_BLAKE_2_B_512 = 11;
HASH_ALG_BLAKE_3 = 12;
- STREEBOG_256 = 13;
- STREEBOG_512 = 14;
+ HASH_ALG_STREEBOG_256 = 13;
+ HASH_ALG_STREEBOG_512 = 14;
}
// Specifies the file hash of the component
From fec8c4c35a6deee371ae37ca531ac187c0dd28e3 Mon Sep 17 00:00:00 2001
From: Dmitry Volk <volk.dmitry@gmail.com>
Date: Thu, 26 Sep 2024 18:07:18 +0300
Subject: [PATCH 06/42] Fix hashing algorithm name, because Streebog is not an
abbreviation, but a name.
Signed-off-by: Dmitry Volk <volk.dmitry@gmail.com>
---
schema/bom-1.7.schema.json | 4 ++--
schema/bom-1.7.xsd | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index 12bbde25..bb5fd2ad 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -1221,8 +1221,8 @@
"BLAKE2b-384",
"BLAKE2b-512",
"BLAKE3",
- "STREEBOG-256",
- "STREEBOG-512"
+ "Streebog-256",
+ "Streebog-512"
]
},
"hash-content": {
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 761a9fbb..07161a1d 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -1131,8 +1131,8 @@ limitations under the License.
<xs:enumeration value="BLAKE2b-384"/>
<xs:enumeration value="BLAKE2b-512"/>
<xs:enumeration value="BLAKE3"/>
- <xs:enumeration value="STREEBOG-256"/>
- <xs:enumeration value="STREEBOG-512"/>
+ <xs:enumeration value="Streebog-256"/>
+ <xs:enumeration value="Streebog-512"/>
</xs:restriction>
</xs:simpleType>
From 08a441dc81630be1ef8ce13c8f075e739d75e393 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 7 Nov 2024 16:51:03 +0100
Subject: [PATCH 07/42] carry over from master: XML,JSON,PB
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.proto | 198 ++++++++++++++++++++++++++++++++---
schema/bom-1.7.schema.json | 94 ++++++++---------
schema/bom-1.7.xsd | 204 +++++++++++++++++++++++++++++--------
3 files changed, 394 insertions(+), 102 deletions(-)
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index d582e605..4677eb5b 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -112,6 +112,7 @@ message Component {
optional string description = 10;
// Specifies the scope of the component. If a scope is not specified, SCOPE_REQUIRED scope should be assumed by the consumer of the BOM
optional Scope scope = 11;
+ // The hashes of the component.
repeated Hash hashes = 12;
// EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)
repeated LicenseChoice licenses = 13;
@@ -133,14 +134,14 @@ message Component {
repeated Component components = 21;
// Specifies optional, custom, properties
repeated Property properties = 22;
- // Specifies optional license and copyright evidence. Only the first item in the optional repeated list is to be taken into account; every other item in the list is to be ignored/omitted.
- repeated Evidence evidence = 23;
+ // Specifies optional license and copyright evidence.
+ optional Evidence evidence = 23;
// Specifies optional release notes.
optional ReleaseNotes releaseNotes = 24;
// A model card describes the intended uses of a machine learning model, potential limitations, biases, ethical considerations, training parameters, datasets used to train the model, performance metrics, and other relevant data useful for ML transparency.
optional ModelCard modelCard = 25;
// This object SHOULD be specified for any component of type `data` and must not be specified for other component types.
- optional ComponentData data = 26;
+ repeated ComponentData data = 26;
// Cryptographic assets have properties that uniquely define them and that make them actionable for further reasoning. As an example, it makes a difference if one knows the algorithm family (e.g. AES) or the specific variant or instantiation (e.g. AES-128-GCM). This is because the security level and the algorithm primitive (authenticated encryption) is only defined by the definition of the algorithm variant. The presence of a weak cryptographic algorithm like SHA1 vs. HMAC-SHA1 also makes a difference.
optional CryptoProperties cryptoProperties = 27;
// The organization that created the component. Manufacturer is common in components created through automated processes. Components created through manual means may have `.authors` instead.
@@ -176,14 +177,20 @@ message DataFlow {
// Specifies the flow direction of the data. Valid values are: inbound, outbound, bi-directional, and unknown. Direction is relative to the service. Inbound flow states that data enters the service. Outbound flow states that data leaves the service. Bi-directional states that data flows both ways, and unknown states that the direction is not known.
// buf:lint:ignore ENUM_VALUE_PREFIX -- Enum value names should be prefixed with "DATA_FLOW_DIRECTION_"
enum DataFlowDirection {
+ // Default
// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
DATA_FLOW_NULL = 0;
+ // Data that enters a service.
DATA_FLOW_INBOUND = 1;
+ // Data that exits a service.
DATA_FLOW_OUTBOUND = 2;
+ // Data flows in and out of the service.
DATA_FLOW_BI_DIRECTIONAL = 3;
+ // The directional flow of data is not known.
DATA_FLOW_UNKNOWN = 4;
}
+// Defines the direct dependencies of a component, service, or the components provided/implemented by a given component. Components or services that do not have their own dependencies must be declared as empty elements within the graph. Components or services that are not represented in the dependency graph may have unknown dependencies. It is recommended that implementations assume this to be opaque and not an indicator of an object being dependency-free. It is recommended to leverage compositions to indicate unknown dependency graphs.
message Dependency {
// References a component or service by its bom-ref attribute
string ref = 1;
@@ -193,6 +200,7 @@ message Dependency {
repeated string provides = 3;
}
+// The patch file (or diff) that shows changes. Refer to https://en.wikipedia.org/wiki/Diff
message Diff {
// Specifies the optional text of the diff
optional AttachedText text = 1;
@@ -200,6 +208,7 @@ message Diff {
optional string url = 2;
}
+// External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM.
message ExternalReference {
// Specifies the type of external reference. There are built-in types to describe common references. If a type does not exist for the reference being referred to, use the "other" type.
ExternalReferenceType type = 1;
@@ -297,6 +306,8 @@ enum ExternalReferenceType {
EXTERNAL_REFERENCE_TYPE_DIGITAL_SIGNATURE = 40;
// Document that complies with RFC-9116 (A File Format to Aid in Security Vulnerability Disclosure)
EXTERNAL_REFERENCE_TYPE_RFC_9116 = 41;
+ // Reference to release notes
+ EXTERNAL_REFERENCE_TYPE_RELEASE_NOTES = 42;
}
enum HashAlg {
@@ -334,6 +345,7 @@ message IdentifiableAction {
}
enum IssueClassification {
+ // Default
// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
ISSUE_CLASSIFICATION_NULL = 0;
// A fault, flaw, or bug in software
@@ -344,6 +356,7 @@ enum IssueClassification {
ISSUE_CLASSIFICATION_SECURITY = 3;
}
+// An individual issue that has been resolved.
message Issue {
// Specifies the type of issue
IssueClassification type = 1;
@@ -353,7 +366,9 @@ message Issue {
optional string name = 3;
// A description of the issue
optional string description = 4;
+ // The source of the issue where it is documented
optional Source source = 5;
+ // A collection of URL's for reference. Multiple URLs are allowed. Example: "https://example.com"
repeated string references = 6;
}
@@ -367,12 +382,15 @@ message Source {
message LicenseChoice {
oneof choice {
+ // A license
License license = 1;
// A valid SPDX license expression. Refer to https://spdx.org/specifications for syntax requirements
string expression = 2;
}
// This field must only be used when "expression" is chosen as the License object has its own acknowledgement.
optional LicenseAcknowledgementEnumeration acknowledgement = 3;
+ // This field must only be used when "expression" is chosen as the License object has its own bom_ref.
+ optional string bom_ref = 4;
}
// Specifies the details and attributes related to a software license. It can either include a valid SPDX license identifier or a named license, along with additional properties such as license acknowledgment, comprehensive commercial licensing information, and the full text of the license.
@@ -426,9 +444,12 @@ message Licensing {
optional google.protobuf.Timestamp expiration = 8;
}
+// EITHER an organization OR an individual
message OrganizationalEntityOrContact {
oneof choice {
+ // Organization
OrganizationalEntity organization = 1;
+ // Individual
OrganizationalContact individual = 2;
}
}
@@ -496,13 +517,13 @@ message Metadata {
}
message Lifecycles {
- oneof choice {
- // A pre-defined phase in the product lifecycle.
- LifecyclePhase phase = 1;
- // The name of the lifecycle phase
- string name = 2;
- }
- // The description of the lifecycle phase
+ oneof choice {
+ // A pre-defined phase in the product lifecycle.
+ LifecyclePhase phase = 1;
+ // The name of the lifecycle phase
+ string name = 2;
+ }
+ // The description of the lifecycle phase
optional string description = 3;
}
@@ -549,6 +570,7 @@ message OrganizationalEntity {
}
enum PatchClassification {
+ // Default
// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
PATCH_CLASSIFICATION_NULL = 0;
// A patch which is not developed by the creators or maintainers of the software being patched. Refer to https://en.wikipedia.org/wiki/Unofficial_patch
@@ -561,11 +583,13 @@ enum PatchClassification {
PATCH_CLASSIFICATION_CHERRY_PICK = 4;
}
+// Specifies an individual patch
message Patch {
// Specifies the purpose for the patch, including the resolution of defects, security issues, or new behavior or functionality
PatchClassification type = 1;
// The patch file (or diff) that show changes. Refer to https://en.wikipedia.org/wiki/Diff
optional Diff diff = 2;
+ // A collection of issues the patch resolves
repeated Issue resolves = 3;
}
@@ -609,11 +633,13 @@ message Service {
optional string version = 5;
// Specifies a description for the service.
optional string description = 6;
+ // The endpoint URIs of the service. Multiple endpoints are allowed. Example: "https://example.com/api/v1/ticker"
repeated string endpoints = 7;
// A boolean value indicating if the service requires authentication. A value of true indicates the service requires authentication prior to use. A value of false indicates the service does not require authentication.
optional bool authenticated = 8;
// A boolean value indicating if the use of the service crosses a trust zone or boundary. A value of true indicates that by using the service, a trust boundary is crossed. A value of false indicates that by using the service, a trust boundary is not crossed.
optional bool x_trust_boundary = 9;
+ // Specifies information about the data including the directional flow of data and the data classification.
repeated DataFlow data = 10;
// EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)
repeated LicenseChoice licenses = 11;
@@ -631,6 +657,7 @@ message Service {
repeated string tags = 17;
}
+// Specifies metadata and content for ISO-IEC 19770-2 Software Identification (SWID) Tags.
message Swid {
// Maps to the tagId of a SoftwareIdentity.
string tag_id = 1;
@@ -668,7 +695,9 @@ message Tool {
// Specifies a property
message Property {
+ // Name (or key)
string name = 1;
+ // Value
optional string value = 2;
}
@@ -714,17 +743,22 @@ message EvidenceCopyright {
string text = 1;
}
+// Provides the ability to document evidence collected through various forms of extraction or analysis.
message Evidence {
// EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)
repeated LicenseChoice licenses = 1;
+ // Copyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
repeated EvidenceCopyright copyright = 2;
+ // Evidence that substantiates the identity of a component. The identity may be an object or an array of identity objects. Support for specifying identity as a single object was introduced in CycloneDX v1.5. Arrays were introduced in v1.6. It is recommended that all implementations use arrays, even if only one identity object is specified.
repeated EvidenceIdentity identity = 3;
+ // Evidence of individual instances of a component spread across multiple locations.
repeated EvidenceOccurrences occurrences = 4;
+ // Evidence of the components use through the callstack.
optional Callstack callstack = 5;
}
-// Evidence of the components use through the callstack.
message Callstack {
+ // Within a call stack, a frame is a discrete unit that encapsulates an execution context, including local variables, parameters, and the return address. As function calls are made, frames are pushed onto the stack, forming an array-like structure that orchestrates the flow of program execution and manages the sequence of function invocations.
repeated Frames frames = 1;
message Frames {
@@ -811,6 +845,7 @@ enum EvidenceTechnique {
EVIDENCE_TECHNIQUE_OTHER = 9;
}
+// A note containing the locale and content.
message Note {
// The ISO-639 (or higher) language code and optional ISO-3166 (or higher) country code. Examples include: "en", "en-US", "fr" and "fr-CA".
optional string locale = 1;
@@ -843,6 +878,7 @@ message ReleaseNotes {
repeated Property properties = 11;
}
+// Defines a weakness in a component or service that could be exploited or triggered by a threat source.
message Vulnerability {
// An optional identifier which can be used to reference the vulnerability elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
optional string bom_ref = 1;
@@ -919,14 +955,22 @@ message VulnerabilityRating {
optional string justification = 6;
}
+// Textual representation of the severity of the vulnerability adopted by the analysis method. If the analysis method uses values other than what is provided, the user is expected to translate appropriately.
enum Severity {
+ // The severity is not known
// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `unknown` is our fallback, doubling `unspecified`
SEVERITY_UNKNOWN = 0;
+ // Critical severity
SEVERITY_CRITICAL = 1;
+ // High severity
SEVERITY_HIGH = 2;
+ // Medium severity
SEVERITY_MEDIUM = 3;
+ // Low severity
SEVERITY_LOW = 4;
+ // Informational warning.
SEVERITY_INFO = 5;
+ // None
SEVERITY_NONE = 6;
}
@@ -950,6 +994,7 @@ enum ScoreMethod {
SCORE_METHOD_SSVC = 7;
}
+// Title and location where advisory information can be obtained. An advisory is a notification of a threat to a component, service, or system.
message Advisory {
// An optional name of the advisory.
optional string title = 1;
@@ -1025,10 +1070,15 @@ enum VulnerabilityResponse {
// unspecified value
// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `null` is our fallback, doubling `unspecified`
VULNERABILITY_RESPONSE_NULL = 0;
+ // Can not fix
VULNERABILITY_RESPONSE_CAN_NOT_FIX = 1;
+ // Will not fix
VULNERABILITY_RESPONSE_WILL_NOT_FIX = 2;
+ // Update to a different revision or release
VULNERABILITY_RESPONSE_UPDATE = 3;
+ // Revert to a previous revision or release
VULNERABILITY_RESPONSE_ROLLBACK = 4;
+ // There is a workaround available
VULNERABILITY_RESPONSE_WORKAROUND_AVAILABLE = 5;
}
@@ -1055,7 +1105,9 @@ enum VulnerabilityAffectedStatus {
// It is unknown (or unspecified) whether the given version is affected.
// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX -- `unknown` is our fallback, doubling `unspecified`
VULNERABILITY_AFFECTED_STATUS_UNKNOWN = 0;
+ // The version is affected by the vulnerability.
VULNERABILITY_AFFECTED_STATUS_AFFECTED = 1;
+ // The version is not affected by the vulnerability.
VULNERABILITY_AFFECTED_STATUS_NOT_AFFECTED = 2;
}
@@ -1085,6 +1137,12 @@ message Annotation {
string text = 5;
}
+/**
+ * A model card describes the intended uses of a machine learning model and potential limitations, including biases and ethical considerations. Model cards typically contain the training parameters, which datasets were used to train the model, performance metrics, and other relevant data useful for ML transparency. This object SHOULD be specified for any component of type `machine-learning-model` and must not be specified for other component types.
+ *
+ * Comment:
+ * Model card support in CycloneDX is derived from TensorFlow Model Card Toolkit released under the Apache 2.0 license and available from https://github.com/tensorflow/model-card-toolkit/blob/main/model_card_toolkit/schema/v0.0.2/model_card.schema.json. In addition, CycloneDX model card support includes portions of VerifyML, also released under the Apache 2.0 license and available from https://github.com/cylynx/verifyml/blob/main/verifyml/model_card_toolkit/schema/v0.0.4/model_card.schema.json.
+ */
message ModelCard {
// An optional identifier which can be used to reference the model card elsewhere in the BOM. Every bom-ref must be unique within the BOM.
optional string bom_ref = 1;
@@ -1112,15 +1170,19 @@ message ModelCard {
repeated MachineLearningInputOutputParameters outputs = 7;
message Approach {
+ // Learning types describing the learning problem or hybrid learning problem.
optional ModelParameterApproachType type = 1;
}
+
message Datasets {
oneof choice {
+ // Inline Data Information
ComponentData dataset = 1;
// References a data component by the components bom-ref attribute
string ref = 2;
}
}
+
message MachineLearningInputOutputParameters {
// The data format for input/output to the model. Example formats include string, image, time-series
optional string format = 1;
@@ -1129,6 +1191,7 @@ message ModelCard {
message QuantitativeAnalysis {
// The model performance metrics being reported. Examples may include accuracy, F1 score, precision, top-3 error rates, MSC, etc.
repeated PerformanceMetrics performanceMetrics = 1;
+ // A collection of graphics that represent various measurements.
optional GraphicsCollection graphics = 2;
message PerformanceMetrics {
@@ -1191,6 +1254,7 @@ message ModelCard {
message EnergyConsumption {
// An activity that is part of a machine learning model development or operational lifecycle.
enum ActivityType {
+ // Default
ACTIVITY_TYPE_UNSPECIFIED = 0;
// a lifecycle activity type whose description does not match currently defined values (the default type).
ACTIVITY_TYPE_OTHER = 1;
@@ -1232,6 +1296,7 @@ message ModelCard {
// Describes the physical provider of energy used for model development or operations.
message EnergyProviderType {
enum EnergySourceType {
+ // Default
ENERGY_SOURCE_TYPE_UNSPECIFIED = 0;
// energy source: unknown. The energy source is unknown.
ENERGY_SOURCE_TYPE_UNKNOWN = 1;
@@ -1274,6 +1339,7 @@ message EnergyProviderType {
// A measure of energy.
message EnergyMeasureType {
enum EnergyMeasureUnitType {
+ //Default
ENERGY_MEASURE_UNIT_TYPE_UNSPECIFIED = 0;
// kilowatt-hour (kWh) is the energy delivered by one kilowatt (kW) of power for one hour (h) (the default unit).
ENERGY_MEASURE_UNIT_TYPE_KILOWATT_HOURS = 1;
@@ -1289,6 +1355,7 @@ message EnergyMeasureType {
// A measure of carbon dioxide (CO2).
message CO2MeasureType {
enum CO2MeasureUnitType {
+ // Default
CO2_MEASURE_UNIT_TYPE_UNSPECIFIED = 0;
// Tonnes (t) of carbon dioxide (CO2) equivalent (eq) (the default unit).
CO2_MEASURE_UNIT_TYPE_TONNES_CO2_EQUIVALENT = 1;
@@ -1363,6 +1430,7 @@ message ComponentData {
}
}
+// Data governance captures information regarding data ownership, stewardship, and custodianship, providing insights into the individuals or entities responsible for managing, overseeing, and safeguarding the data throughout its lifecycle.
message DataGovernance {
// Data custodians are responsible for the safe custody, transport, and storage of data.
repeated DataGovernanceResponsibleParty custodians = 1;
@@ -1373,7 +1441,9 @@ message DataGovernance {
message DataGovernanceResponsibleParty {
oneof choice {
+ // The organization that is responsible for specific data governance role(s).
OrganizationalEntity organization = 1;
+ // The individual that is responsible for specific data governance role(s).
OrganizationalContact contact = 2;
}
}
@@ -1393,6 +1463,7 @@ enum ComponentDataType {
COMPONENT_DATA_TYPE_OTHER = 4;
}
+// A collection of graphics that represent various measurements.
message GraphicsCollection {
// A description of this collection of graphics.
optional string description = 1;
@@ -1679,7 +1750,9 @@ message OutputType {
// Type that permits a choice to reference a resource using an iternal bom-ref identifier or an external reference.
message ResourceReferenceChoice {
oneof choice {
+ // References an object by its bom-ref attribute
string ref = 1;
+ // Reference to an externally accessible resource
ExternalReference externalReference = 2;
}
}
@@ -1734,11 +1807,14 @@ message Parameter {
message EnvironmentVars {
oneof choice {
+ // Name-value pair
Property property = 1;
+ // Value
string value = 2;
}
}
+// The list of declarations which describe the conformance to standards. Each declaration may include attestations, claims, and evidence.
message Declarations {
message Assessor {
// An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
@@ -1748,8 +1824,13 @@ message Declarations {
// The entity issuing the assessment.
optional OrganizationalEntity organization = 3;
}
+
+ // Attestation
message Attestation {
+ // Map
message AttestationMap {
+
+ // Conformance
message AttestationConformance {
// The conformance of the claim between and inclusive of 0 and 1, where 1 is 100% conformance.
optional double score = 1;
@@ -1758,12 +1839,15 @@ message Declarations {
// The list of `bom-ref` to the evidence provided describing the mitigation strategies.
repeated string mitigationStrategies = 3;
}
+
+ // Confidence
message AttestationConfidence {
// The confidence of the claim between and inclusive of 0 and 1, where 1 is 100% confidence.
optional double score = 1;
// The rationale for the confidence score.
optional string rationale = 2;
}
+
// The `bom-ref` to the requirement being attested to.
optional string requirement = 1;
// The list of `bom-ref` to the claims being attested to.
@@ -1775,6 +1859,7 @@ message Declarations {
// The confidence of the claim meeting the requirement.
optional AttestationConfidence confidence = 5;
}
+
// The short description explaining the main points of the attestation.
optional string summary = 1;
// The `bom-ref` to the assessor asserting the attestation.
@@ -1782,6 +1867,7 @@ message Declarations {
// The grouping of requirements to claims and the attestors' declared conformance and confidence thereof.
repeated AttestationMap map = 3;
}
+
message Claim {
// An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
optional string bom_ref = 1;
@@ -1800,6 +1886,7 @@ message Declarations {
// External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM.
repeated ExternalReference externalReferences = 8;
}
+
message Evidence {
message Data {
message Contents {
@@ -1808,6 +1895,7 @@ message Declarations {
// The URL to where the data can be retrieved.
optional string url = 2;
}
+
// The name of the data.
optional string name = 1;
// The contents or references to the contents of the data being described.
@@ -1819,6 +1907,7 @@ message Declarations {
// Data Governance
optional DataGovernance governance = 5;
}
+
// An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
optional string bom_ref = 1;
// The reference to the property name as defined in the CycloneDX Property Taxonomy: https://github.com/CycloneDX/cyclonedx-property-taxonomy/.
@@ -1836,6 +1925,7 @@ message Declarations {
// The reviewer of the evidence.
optional OrganizationalContact reviewer = 8;
}
+
message Targets {
// The list of organizations which claims are made against.
repeated OrganizationalEntity organizations = 1;
@@ -1844,6 +1934,7 @@ message Declarations {
// The list of services which claims are made against.
repeated Service services = 3;
}
+
message Affirmation {
message Signatory {
// The signatory's name.
@@ -1855,11 +1946,13 @@ message Declarations {
// An External reference provides a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM.
optional ExternalReference externalReference = 4;
}
- // The brief statement affirmed by an individual regarding all declarations. Notes: This could be an affirmation of acceptance by a third-party auditor or receiving individual of a file.
+
+ // The brief statement affirmed by an individual regarding all declarations. Notes: This could be an affirmation of acceptance by a third-party auditor or receiving individual of a file. Example: "I certify, to the best of my knowledge, that all information is correct."
optional string statement = 1;
// The list of signatories authorized on behalf of an organization to assert validity of this document.
repeated Signatory signatories = 2;
}
+
// The list of assessors evaluating claims and determining conformance to requirements and confidence in that assessment.
repeated Assessor assessors = 1;
// The list of attestations asserted by an assessor that maps requirements to claims.
@@ -1870,11 +1963,12 @@ message Declarations {
repeated Evidence evidence = 4;
// The list of targets which claims are made against.
optional Targets targets = 5;
- // affirmation
+ // A concise statement affirmed by an individual regarding all declarations, often used for third-party auditor acceptance or recipient acknowledgment. It includes a list of authorized signatories who assert the validity of the document on behalf of the organization.
optional Affirmation affirmation = 6;
}
message Definition {
+ // A standard may consist of regulations, industry or organizational-specific standards, maturity models, best practices, or any other requirements which can be evaluated against or attested to.
message Standard {
message Requirement {
// An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
@@ -1896,6 +1990,7 @@ message Definition {
// External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM.
repeated ExternalReference externalReferences = 9;
}
+
message Level {
// An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
optional string bom_ref = 1;
@@ -1908,6 +2003,7 @@ message Definition {
// The list of requirement `bom-ref`s that comprise the level.
repeated string requirements = 5;
}
+
// An optional identifier which can be used to reference the component elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
optional string bom_ref = 1;
// The name of the standard. This will often be a shortened, single name of the standard.
@@ -1925,19 +2021,30 @@ message Definition {
// External references provide a way to document systems, sites, and information that may be relevant but are not included with the BOM. They may also establish specific relationships within or external to the BOM.
repeated ExternalReference externalReferences = 8;
}
+
+ // The list of standards which may consist of regulations, industry or organizational-specific standards, maturity models, best practices, or any other requirements which can be evaluated against or attested to.
repeated Standard standards = 1;
}
+// "Cryptographic Properties
message CryptoProperties {
+ // Asset Type
enum CryptoAssetType {
// ProtoBuff's default value
CRYPTO_ASSET_TYPE_UNSPECIFIED = 0;
+ // Mathematical function commonly used for data encryption, authentication, and digital signatures.
CRYPTO_ASSET_TYPE_ALGORITHM = 1;
+ // An electronic document that is used to provide the identity or validate a public key.
CRYPTO_ASSET_TYPE_CERTIFICATE = 2;
+ // A set of rules and guidelines that govern the behavior and communication with each other.
CRYPTO_ASSET_TYPE_PROTOCOL = 3;
+ // Other cryptographic assets related to algorithms, certificates, and protocols such as keys and tokens.
CRYPTO_ASSET_TYPE_RELATED_CRYPTO_MATERIAL = 4;
}
+
+ // Algorithm Propertie
message AlgorithmProperties {
+ // Primitive
enum CryptoPrimitive {
// ProtoBuff's default value -- it differs from "unknown"
CRYPTO_PRIMITIVE_UNSPECIFIED = 0;
@@ -1945,20 +2052,35 @@ message CryptoProperties {
CRYPTO_PRIMITIVE_UNKNOWN = 1;
// Another primitive type - none of the following
CRYPTO_PRIMITIVE_OTHER = 2;
+ // Deterministic Random Bit Generator (DRBG) is a type of pseudorandom number generator designed to produce a sequence of bits from an initial seed value. DRBGs are commonly used in cryptographic applications where reproducibility of random values is important.
CRYPTO_PRIMITIVE_DRBG = 3;
+ // In cryptography, a Message Authentication Code (MAC) is information used for authenticating and integrity-checking a message.
CRYPTO_PRIMITIVE_MAC = 4;
+ // A block cipher is a symmetric key algorithm that operates on fixed-size blocks of data. It encrypts or decrypts the data in block units, providing confidentiality. Block ciphers are widely used in various cryptographic modes and protocols for secure data transmission.
CRYPTO_PRIMITIVE_BLOCK_CIPHER = 5;
+ // A stream cipher is a symmetric key cipher where plaintext digits are combined with a pseudorandom cipher digit stream (keystream).
CRYPTO_PRIMITIVE_STREAM_CIPHER = 6;
+ // In cryptography, a signature is a digital representation of a message or data that proves its origin, identity, and integrity. Digital signatures are generated using cryptographic algorithms and are widely used for authentication and verification in secure communication.
CRYPTO_PRIMITIVE_SIGNATURE = 7;
+ // A hash function is a mathematical algorithm that takes an input (or 'message') and produces a fixed-size string of characters, which is typically a hash value. Hash functions are commonly used in various cryptographic applications, including data integrity verification and password hashing.
CRYPTO_PRIMITIVE_HASH = 8;
+ // Public Key Encryption (PKE) is a type of encryption that uses a pair of public and private keys for secure communication. The public key is used for encryption, while the private key is used for decryption. PKE is a fundamental component of public-key cryptography.
CRYPTO_PRIMITIVE_PKE = 9;
+ // An XOF is an extendable output function that can take arbitrary input and creates a stream of output, up to a limit determined by the size of the internal state of the hash function that underlies the XOF.
CRYPTO_PRIMITIVE_XOF = 10;
+ // A Key Derivation Function (KDF) derives key material from another source of entropy while preserving the entropy of the input.
CRYPTO_PRIMITIVE_KDF = 11;
+ // In cryptography, a key-agreement is a protocol whereby two or more parties agree on a cryptographic key in such a way that both influence the outcome.
CRYPTO_PRIMITIVE_KEY_AGREE = 12;
+ // A Key Encapsulation Mechanism (KEM) algorithm is a mechanism for transporting random keying material to a recipient using the recipient's public key.
CRYPTO_PRIMITIVE_KEM = 13;
+ // Authenticated Encryption (AE) is a cryptographic process that provides both confidentiality and data integrity. It ensures that the encrypted data has not been tampered with and comes from a legitimate source. AE is commonly used in secure communication protocols.
CRYPTO_PRIMITIVE_AE = 14;
+ // A combiner aggregates many candidates for a cryptographic primitive and generates a new candidate for the same primitive.
CRYPTO_PRIMITIVE_COMBINER = 15;
}
+
+ // Execution Environment
enum CryptoExecutionEnvironment {
// ProtoBuff's default value -- it differs from "unknown"
CRYPTO_EXECUTION_ENVIRONMENT_UNSPECIFIED = 0;
@@ -1966,11 +2088,17 @@ message CryptoProperties {
CRYPTO_EXECUTION_ENVIRONMENT_UNKNOWN = 1;
// Another implementation environment - none of the following
CRYPTO_EXECUTION_ENVIRONMENT_OTHER = 2;
+ // A software implementation running in plain unencrypted RAM.
CRYPTO_EXECUTION_ENVIRONMENT_SOFTWARE_PLAIN_RAM = 3;
+ // A software implementation running in encrypted RAM.
CRYPTO_EXECUTION_ENVIRONMENT_SOFTWARE_ENCRYPTED_RAM = 4;
+ // A software implementation running in a trusted execution environment.
CRYPTO_EXECUTION_ENVIRONMENT_SOFTWARE_TEE = 5;
+ // A hardware implementation.
CRYPTO_EXECUTION_ENVIRONMENT_HARDWARE = 6;
}
+
+ // Implementation platform
enum CryptoImplementationPlatform {
// ProtoBuff's default value -- it differs from "unknown"
CRYPTO_IMPLEMENTATION_PLATFORM_UNSPECIFIED = 0;
@@ -1991,6 +2119,8 @@ message CryptoProperties {
CRYPTO_IMPLEMENTATION_PLATFORM_PPC64 = 13;
CRYPTO_IMPLEMENTATION_PLATFORM_PPC64LE = 14;
}
+
+ // Mode
enum CryptoAlgorithmMode {
// ProtoBuff's default value -- it differs from "unknown"
CRYPTO_ALGORITHM_MODE_UNSPECIFIED = 0;
@@ -1998,14 +2128,23 @@ message CryptoProperties {
CRYPTO_ALGORITHM_MODE_UNKNOWN = 1;
// Another mode of operation - none of the following
CRYPTO_ALGORITHM_MODE_OTHER = 2;
+ // Cipher block chaining
CRYPTO_ALGORITHM_MODE_CBC = 3;
+ // Electronic codebook
CRYPTO_ALGORITHM_MODE_ECB = 4;
+ // Counter with cipher block chaining message authentication code
CRYPTO_ALGORITHM_MODE_CCM = 5;
+ // Galois/counter
CRYPTO_ALGORITHM_MODE_GCM = 6;
+ // Cipher feedback
CRYPTO_ALGORITHM_MODE_CFB = 7;
+ // Output feedback
CRYPTO_ALGORITHM_MODE_OFB = 8;
+ // Counter
CRYPTO_ALGORITHM_MODE_CTR = 9;
}
+
+ // Padding
enum CryptoAlgorithmPadding {
// ProtoBuff's default value -- it differs from "unknown"
CRYPTO_ALGORITHM_PADDING_UNSPECIFIED = 0;
@@ -2013,12 +2152,19 @@ message CryptoProperties {
CRYPTO_ALGORITHM_PADDING_UNKNOWN = 1;
// Another padding scheme - none of the following
CRYPTO_ALGORITHM_PADDING_OTHER = 2;
+ // Public Key Cryptography Standard: Password-Based Cryptography
CRYPTO_ALGORITHM_PADDING_PKCS5 = 3;
+ // Public Key Cryptography Standard: Cryptographic Message Syntax
CRYPTO_ALGORITHM_PADDING_PKCS7 = 4;
+ // Public Key Cryptography Standard: RSA Cryptography v1.5
CRYPTO_ALGORITHM_PADDING_PKCS1V15 = 5;
+ // Optimal asymmetric encryption padding
CRYPTO_ALGORITHM_PADDING_OAEP = 6;
+ // Raw
CRYPTO_ALGORITHM_PADDING_RAW = 7;
}
+
+ // Cryptographic functions
enum CryptoAlgorithmFunction {
// ProtoBuff's default value -- it differs from "unknown"
CRYPTO_ALGORITHM_FUNCTION_UNSPECIFIED = 0;
@@ -2038,6 +2184,7 @@ message CryptoProperties {
CRYPTO_ALGORITHM_FUNCTION_ENCAPSULATE = 12;
CRYPTO_ALGORITHM_FUNCTION_DECAPSULATE = 13;
}
+
// Cryptographic building blocks used in higher-level cryptographic systems and protocols. Primitives represent different cryptographic routines: deterministic random bit generators (drbg, e.g. CTR_DRBG from NIST SP800-90A-r1), message authentication codes (mac, e.g. HMAC-SHA-256), blockciphers (e.g. AES), streamciphers (e.g. Salsa20), signatures (e.g. ECDSA), hash functions (e.g. SHA-256), public-key encryption schemes (pke, e.g. RSA), extended output functions (xof, e.g. SHAKE256), key derivation functions (e.g. pbkdf2), key agreement algorithms (e.g. ECDH), key encapsulation mechanisms (e.g. ML-KEM), authenticated encryption (ae, e.g. AES-GCM) and the combination of multiple algorithms (combiner, e.g. SP800-56Cr2).
optional CryptoPrimitive primitive = 1;
// An identifier for the parameter set of the cryptographic algorithm. Examples: in AES128, '128' identifies the key length in bits, in SHA256, '256' identifies the digest length, '128' in SHAKE128 identifies its maximum security level in bits, and 'SHA2-128s' identifies a parameter set used in SLH-DSA (FIPS205).
@@ -2061,6 +2208,8 @@ message CryptoProperties {
// The NIST security strength category as defined in https://csrc.nist.gov/projects/post-quantum-cryptography/post-quantum-cryptography-standardization/evaluation-criteria/security-(evaluation-criteria). A value of 0 indicates that none of the categories are met.
optional int32 nistQuantumSecurityLevel = 11;
} // end of AlgorithmProperties
+
+ // Certificate Properties
message CertificateProperties {
// The subject name for the certificate
optional string subjectName = 1;
@@ -2079,7 +2228,11 @@ message CryptoProperties {
// The file extension of the certificate. Examples include crt, pem, cer, der, and p12.
optional string certificateExtension = 8;
} // end of CertificateProperties
+
+ // Related Cryptographic Material Properties
message RelatedCryptoMaterialProperties {
+
+ // relatedCryptoMaterialType
enum CryptoRelatedType {
// ProtoBuff's default value -- it differs from "unknown"
CRYPTO_RELATED_TYPE_UNSPECIFIED = 0;
@@ -2105,6 +2258,8 @@ message CryptoProperties {
CRYPTO_RELATED_TYPE_CREDENTIAL = 18;
CRYPTO_RELATED_TYPE_TOKEN = 19;
}
+
+ // State
enum CryptoRelatedState {
// Default
CRYPTO_RELATED_STATE_UNSPECIFIED = 0;
@@ -2115,12 +2270,15 @@ message CryptoProperties {
CRYPTO_RELATED_STATE_COMPROMISED = 5;
CRYPTO_RELATED_STATE_DESTROYED = 6;
}
+
+ // Secured By
message CryptoRelatedSecuredBy {
// Specifies the mechanism by which the cryptographic asset is secured. Examples include HSM, TPM, SGX, Software, and None
optional string mechanism = 1;
// The bom-ref to the algorithm.
optional string algorithmRef = 2;
}
+
// The type for the related cryptographic material
optional CryptoRelatedType type = 1;
// The optional unique identifier for the related cryptographic material.
@@ -2146,6 +2304,8 @@ message CryptoProperties {
// The mechanism by which the cryptographic asset is secured.
optional CryptoRelatedSecuredBy securedBy = 12;
} // end of RelatedCryptoMaterialProperties
+
+ // Protocol Properties
message ProtocolProperties {
enum CryptoProtocolType {
// ProtoBuff's default value -- it differs from "unknown"
@@ -2154,13 +2314,21 @@ message CryptoProperties {
CRYPTO_PROTOCOL_TYPE_UNKNOWN = 1;
// Another protocol type - none of the following
CRYPTO_PROTOCOL_TYPE_OTHER = 2;
+ // Transport Layer Security
CRYPTO_PROTOCOL_TYPE_TLS = 3;
+ // Secure Shell
CRYPTO_PROTOCOL_TYPE_SSH = 4;
+ // Internet Protocol Security
CRYPTO_PROTOCOL_TYPE_IPSEC = 5;
+ // Internet Key Exchange
CRYPTO_PROTOCOL_TYPE_IKE = 6;
+ // Secure Socket Tunneling Protocol
CRYPTO_PROTOCOL_TYPE_SSTP = 7;
+ // Wi-Fi Protected Access
CRYPTO_PROTOCOL_TYPE_WPA = 8;
}
+
+ // Object representing a cipher suite
message CryptoProtocolCipherSuite {
// A common name for the cipher suite. For example: TLS_DHE_RSA_WITH_AES_128_CCM
optional string name = 1;
@@ -2169,6 +2337,8 @@ message CryptoProperties {
// A list of common identifiers for the cipher suite. For example: 0xC0 and 0x9E
repeated string identifiers = 3;
}
+
+ // IKEv2 Transform Types
message Ikev2TransformTypes {
// Transform Type 1: encryption algorithms
repeated string encr = 1;
@@ -2183,6 +2353,7 @@ message CryptoProperties {
// IKEv2 Authentication method
repeated string auth = 6;
}
+
// The concrete protocol type.
optional CryptoProtocolType type = 1;
// The version of the protocol. Examples include 1.0, 1.2, and 1.99.
@@ -2194,6 +2365,7 @@ message CryptoProperties {
// The bom-ref(s) to protocol-related cryptographic assets
repeated string cryptoRef = 5;
} // end of ProtocolProperties
+
// Cryptographic assets occur in several forms. Algorithms and protocols are most commonly implemented in specialized cryptographic libraries. They may, however, also be 'hardcoded' in software components. Certificates and related cryptographic material like keys, tokens, secrets or passwords are other cryptographic assets to be modelled.
CryptoAssetType assetType = 1;
// Additional properties specific to a cryptographic algorithm.
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index 6adf03a2..e754aefb 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -640,7 +640,7 @@
}
]
}
- },
+ },
"tools": {
"title": "Tools",
"description": "The tool(s) used in the creation, enrichment, and validation of the BOM.",
@@ -1067,7 +1067,7 @@
"title": "Release notes",
"description": "Specifies optional release notes."
},
- "modelCard": {
+ "modelCard": {
"$ref": "#/definitions/modelCard",
"title": "AI/ML Model Card"
},
@@ -5439,71 +5439,71 @@
}
},
"id": {
- "type": "string",
- "title": "ID",
- "description": "The optional unique identifier for the related cryptographic material."
+ "type": "string",
+ "title": "ID",
+ "description": "The optional unique identifier for the related cryptographic material."
},
"state": {
- "type": "string",
- "title": "State",
- "description": "The key state as defined by NIST SP 800-57.",
- "enum": [
- "pre-activation",
- "active",
- "suspended",
- "deactivated",
- "compromised",
- "destroyed"
- ]
+ "type": "string",
+ "title": "State",
+ "description": "The key state as defined by NIST SP 800-57.",
+ "enum": [
+ "pre-activation",
+ "active",
+ "suspended",
+ "deactivated",
+ "compromised",
+ "destroyed"
+ ]
},
"algorithmRef": {
- "$ref": "#/definitions/refType",
- "title": "Algorithm Reference",
- "description": "The bom-ref to the algorithm used to generate the related cryptographic material."
+ "$ref": "#/definitions/refType",
+ "title": "Algorithm Reference",
+ "description": "The bom-ref to the algorithm used to generate the related cryptographic material."
},
"creationDate": {
- "type": "string",
- "format": "date-time",
- "title": "Creation Date",
- "description": "The date and time (timestamp) when the related cryptographic material was created."
+ "type": "string",
+ "format": "date-time",
+ "title": "Creation Date",
+ "description": "The date and time (timestamp) when the related cryptographic material was created."
},
"activationDate": {
- "type": "string",
- "format": "date-time",
- "title": "Activation Date",
- "description": "The date and time (timestamp) when the related cryptographic material was activated."
+ "type": "string",
+ "format": "date-time",
+ "title": "Activation Date",
+ "description": "The date and time (timestamp) when the related cryptographic material was activated."
},
"updateDate": {
- "type": "string",
- "format": "date-time",
- "title": "Update Date",
- "description": "The date and time (timestamp) when the related cryptographic material was updated."
+ "type": "string",
+ "format": "date-time",
+ "title": "Update Date",
+ "description": "The date and time (timestamp) when the related cryptographic material was updated."
},
"expirationDate": {
- "type": "string",
- "format": "date-time",
- "title": "Expiration Date",
- "description": "The date and time (timestamp) when the related cryptographic material expires."
+ "type": "string",
+ "format": "date-time",
+ "title": "Expiration Date",
+ "description": "The date and time (timestamp) when the related cryptographic material expires."
},
"value": {
- "type": "string",
- "title": "Value",
- "description": "The associated value of the cryptographic material."
+ "type": "string",
+ "title": "Value",
+ "description": "The associated value of the cryptographic material."
},
"size": {
- "type": "integer",
- "title": "Size",
- "description": "The size of the cryptographic asset (in bits)."
+ "type": "integer",
+ "title": "Size",
+ "description": "The size of the cryptographic asset (in bits)."
},
"format": {
- "type": "string",
- "title": "Format",
- "description": "The format of the related cryptographic material (e.g. P8, PEM, DER)."
+ "type": "string",
+ "title": "Format",
+ "description": "The format of the related cryptographic material (e.g. P8, PEM, DER)."
},
"securedBy": {
- "$ref": "#/definitions/securedBy",
- "title": "Secured By",
- "description": "The mechanism by which the cryptographic asset is secured by."
+ "$ref": "#/definitions/securedBy",
+ "title": "Secured By",
+ "description": "The mechanism by which the cryptographic asset is secured by."
}
}
},
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 00d98963..d398458b 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -572,6 +572,9 @@ limitations under the License.
</xs:annotation>
</xs:element>
<xs:element name="hashes" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The hashes of the component.</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="hash" type="bom:hashType"/>
@@ -698,7 +701,7 @@ limitations under the License.
type `machine-learning-model` and must not be specified for other component types.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="data" type="bom:componentDataType" minOccurs="0" maxOccurs="1">
+ <xs:element name="data" type="bom:componentDataType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>This object SHOULD be specified for any component of type `data` and must not be
specified for other component types.</xs:documentation>
@@ -764,7 +767,7 @@ limitations under the License.
It can either include a valid SPDX license identifier or a named license, along with additional
properties such as license acknowledgment, comprehensive commercial licensing information, and
the full text of the license.</xs:documentation>
- </xs:annotation>
+ </xs:annotation>
<xs:sequence>
<xs:choice>
<xs:element name="id" type="spdx:licenseId" minOccurs="1" maxOccurs="1">
@@ -1842,6 +1845,12 @@ limitations under the License.
</xs:complexType>
</xs:element>
<xs:element name="references" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ A collection of URL's for reference. Multiple URLs are allowed.
+ Example: "https://example.com"
+ </xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="url" type="xs:anyURI"/>
@@ -2058,6 +2067,12 @@ limitations under the License.
</xs:annotation>
</xs:element>
<xs:element name="endpoints" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ The endpoint URIs of the service. Multiple endpoints are allowed.
+ Example: "https://example.com/api/v1/ticker"
+ </xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="endpoint" type="xs:anyURI" minOccurs="1">
@@ -2088,6 +2103,9 @@ limitations under the License.
</xs:annotation>
</xs:element>
<xs:element name="data" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Specifies information about the data including the directional flow of data and the data classification.</xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:choice>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -2253,10 +2271,28 @@ limitations under the License.
states that the direction is not known.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
- <xs:enumeration value="inbound"/>
- <xs:enumeration value="outbound"/>
- <xs:enumeration value="bi-directional"/>
- <xs:enumeration value="unknown"/>
+ <xs:enumeration value="inbound">
+ <xs:annotation>
+ <xs:documentation>
+ Data that enters a service.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="outbound">
+ <xs:annotation>
+ <xs:documentation>Data that exits a service.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="bi-directional">
+ <xs:annotation>
+ <xs:documentation>Data flows in and out of the service.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unknown">
+ <xs:annotation>
+ <xs:documentation>The directional flow of data is not known.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
</xs:restriction>
</xs:simpleType>
@@ -2311,12 +2347,12 @@ limitations under the License.
<xs:simpleType name="licenseAcknowledgementEnumerationType">
<xs:restriction base="xs:string">
<xs:enumeration value="declared">
- <xs:annotation>
- <xs:documentation>
- Declared licenses represent the initial intentions of authors regarding
- the licensing terms of their code.
- </xs:documentation>
- </xs:annotation>
+ <xs:annotation>
+ <xs:documentation>
+ Declared licenses represent the initial intentions of authors regarding
+ the licensing terms of their code.
+ </xs:documentation>
+ </xs:annotation>
</xs:enumeration>
<xs:enumeration value="concluded">
<xs:annotation>
@@ -2562,6 +2598,11 @@ limitations under the License.
<xs:complexType>
<xs:sequence>
<xs:element name="frame" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Within a call stack, a frame is a discrete unit that encapsulates an execution context, including local variables, parameters, and the return address. As function calls are made, frames are pushed onto the stack, forming an array-like structure that orchestrates the flow of program execution and manages the sequence of function invocations.
+ </xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="package" type="xs:string" minOccurs="0" maxOccurs="1">
@@ -2628,7 +2669,13 @@ limitations under the License.
</xs:complexType>
</xs:element>
<xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="copyright" type="bom:copyrightsType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="copyright" type="bom:copyrightsType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ opyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
@@ -2862,7 +2909,8 @@ limitations under the License.
<xs:element name="alias" type="xs:normalizedString">
<xs:annotation>
<xs:documentation>One or more alternate names the release may be referred to. This may
- include unofficial terms used by development and marketing teams (e.g. code names).</xs:documentation>
+ include unofficial terms used by development and marketing teams (e.g. code names).
+ </xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
@@ -2885,7 +2933,8 @@ limitations under the License.
<xs:element name="note">
<xs:annotation>
<xs:documentation>Zero or more release notes containing the locale and content. Multiple
- note elements may be specified to support release notes in a wide variety of languages.</xs:documentation>
+ note elements may be specified to support release notes in a wide variety of languages.
+ </xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -2932,13 +2981,13 @@ limitations under the License.
</xs:anyAttribute>
</xs:complexType>
- <!--
- Model card support in CycloneDX is derived from TensorFlow Model Card Toolkit released under the Apache 2.0 license and
- available from https://github.com/tensorflow/model-card-toolkit/blob/main/model_card_toolkit/schema/v0.0.2/model_card.schema.json.
- In addition, CycloneDX model card support includes portions of VerifyML, also released under the Apache 2.0 license and
- available from https://github.com/cylynx/verifyml/blob/main/verifyml/model_card_toolkit/schema/v0.0.4/model_card.schema.json.
- -->
<xs:complexType name="modelCardType">
+ <!--
+ Model card support in CycloneDX is derived from TensorFlow Model Card Toolkit released under the Apache 2.0 license and
+ available from https://github.com/tensorflow/model-card-toolkit/blob/main/model_card_toolkit/schema/v0.0.2/model_card.schema.json.
+ In addition, CycloneDX model card support includes portions of VerifyML, also released under the Apache 2.0 license and
+ available from https://github.com/cylynx/verifyml/blob/main/verifyml/model_card_toolkit/schema/v0.0.4/model_card.schema.json.
+ -->
<xs:annotation>
<xs:documentation>
A model card describes the intended uses of a machine learning model and potential limitations, including
@@ -3014,7 +3063,11 @@ limitations under the License.
<xs:union memberTypes="bom:refLinkType bom:bomLinkElementType"/>
</xs:simpleType>
</xs:element>
- <xs:element name="dataset" type="bom:componentDataType" minOccurs="0" maxOccurs="1" />
+ <xs:element name="dataset" type="bom:componentDataType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Inline Data Information</xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:choice>
</xs:complexType>
</xs:element>
@@ -4218,9 +4271,9 @@ limitations under the License.
</xs:annotation>
<xs:sequence>
<xs:element name="reproductionSteps" type="xs:string" minOccurs="0" maxOccurs="1">
- <xs:annotation>
- <xs:documentation>Precise steps to reproduce the vulnerability.</xs:documentation>
- </xs:annotation>
+ <xs:annotation>
+ <xs:documentation>Precise steps to reproduce the vulnerability.</xs:documentation>
+ </xs:annotation>
</xs:element>
<xs:element name="environment" type="xs:string" minOccurs="0" maxOccurs="1">
<xs:annotation>
@@ -4480,7 +4533,8 @@ limitations under the License.
<xs:element name="url" type="xs:anyURI" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>The url of the vulnerability documentation as provided by the source.
- For example: https://nvd.nist.gov/vuln/detail/CVE-2021-39182</xs:documentation>
+ For example: https://nvd.nist.gov/vuln/detail/CVE-2021-39182
+ </xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
@@ -4649,13 +4703,41 @@ limitations under the License.
</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
- <xs:enumeration value="critical"/>
- <xs:enumeration value="high"/>
- <xs:enumeration value="medium"/>
- <xs:enumeration value="low"/>
- <xs:enumeration value="info"/>
- <xs:enumeration value="none"/>
- <xs:enumeration value="unknown"/>
+ <xs:enumeration value="critical">
+ <xs:annotation>
+ <xs:documentation>Critical severity</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="high">
+ <xs:annotation>
+ <xs:documentation>High severity</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="medium">
+ <xs:annotation>
+ <xs:documentation>Medium severity</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="low">
+ <xs:annotation>
+ <xs:documentation>Low severity</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="info">
+ <xs:annotation>
+ <xs:documentation>Informational warning.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="none">
+ <xs:annotation>
+ <xs:documentation>None</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unknown">
+ <xs:annotation>
+ <xs:documentation>The severity is not known</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
</xs:restriction>
</xs:simpleType>
@@ -4852,11 +4934,31 @@ limitations under the License.
</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
- <xs:enumeration value="can_not_fix"/>
- <xs:enumeration value="will_not_fix"/>
- <xs:enumeration value="update"/>
- <xs:enumeration value="rollback"/>
- <xs:enumeration value="workaround_available"/>
+ <xs:enumeration value="can_not_fix">
+ <xs:annotation>
+ <xs:documentation>Can not fix</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="will_not_fix">
+ <xs:annotation>
+ <xs:documentation>Will not fix</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="update">
+ <xs:annotation>
+ <xs:documentation>Update to a different revision or release</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="rollback">
+ <xs:annotation>
+ <xs:documentation>Revert to a previous revision or release</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="workaround_available">
+ <xs:annotation>
+ <xs:documentation>There is a workaround available</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
</xs:restriction>
</xs:simpleType>
@@ -4871,9 +4973,21 @@ limitations under the License.
</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
- <xs:enumeration value="affected"/>
- <xs:enumeration value="unaffected"/>
- <xs:enumeration value="unknown"/>
+ <xs:enumeration value="affected">
+ <xs:annotation>
+ <xs:documentation>The version is affected by the vulnerability.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unaffected">
+ <xs:annotation>
+ <xs:documentation>The version is not affected by the vulnerability.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="unknown">
+ <xs:annotation>
+ <xs:documentation>It is unknown (or unspecified) whether the given version is affected.</xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
</xs:restriction>
</xs:simpleType>
@@ -7834,6 +7948,12 @@ limitations under the License.
</xs:complexType>
</xs:element>
<xs:element name="affirmation" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A concise statement affirmed by an individual regarding all declarations, often used for third-party auditor acceptance or recipient acknowledgment.
+ It includes a list of authorized signatories who assert the validity of the document on behalf of the organization.
+ </xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="statement" type="xs:string" minOccurs="0" maxOccurs="1">
@@ -8027,7 +8147,7 @@ limitations under the License.
</xs:annotation>
<xs:complexType>
<xs:sequence>
- <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
From bcea8a9c9ccf3bd5847ce5ebf2365133849da9f9 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 12 Dec 2024 17:22:47 +0100
Subject: [PATCH 08/42] incorporate latest changes from master
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.schema.json | 2 +-
schema/bom-1.7.xsd | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index e754aefb..2a8e13ab 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -2237,7 +2237,7 @@
"aggregate": {
"$ref": "#/definitions/aggregateType",
"title": "Aggregate",
- "description": "Specifies an aggregate type that describe how complete a relationship is."
+ "description": "Specifies an aggregate type that describes how complete a relationship is."
},
"assemblies": {
"type": "array",
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index d398458b..173634c9 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -2672,7 +2672,7 @@ limitations under the License.
<xs:element name="copyright" type="bom:copyrightsType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
- opyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
+ Copyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -2715,7 +2715,7 @@ limitations under the License.
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="aggregate" type="bom:aggregateType" default="not_specified">
<xs:annotation>
- <xs:documentation>Specifies an aggregate type that describe how complete a relationship is.</xs:documentation>
+ <xs:documentation>Specifies an aggregate type that describes how complete a relationship is.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="assemblies" minOccurs="0" maxOccurs="1">
From 2eeeb2a6071ec7e9d346fb6e36616d35ffc1f6d0 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Sat, 11 Jan 2025 17:16:56 +0100
Subject: [PATCH 09/42] docs: docsgen prep for 1.7
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
docgen/json/templates/cyclonedx/base.html | 1 +
docgen/proto/gen.sh | 1 +
docgen/proto/templates/html.tmpl | 9 ++++++---
docgen/xml/xs3p.xsl | 1 +
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/docgen/json/templates/cyclonedx/base.html b/docgen/json/templates/cyclonedx/base.html
index dfebb915..ba53be00 100644
--- a/docgen/json/templates/cyclonedx/base.html
+++ b/docgen/json/templates/cyclonedx/base.html
@@ -56,6 +56,7 @@
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
<li><hr class="dropdown-divider"/></li>
+ <li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>
diff --git a/docgen/proto/gen.sh b/docgen/proto/gen.sh
index 5d7a38e7..c4952c7a 100755
--- a/docgen/proto/gen.sh
+++ b/docgen/proto/gen.sh
@@ -46,3 +46,4 @@ generate 1.3
generate 1.4
generate 1.5
generate 1.6
+generate 1.7
diff --git a/docgen/proto/templates/html.tmpl b/docgen/proto/templates/html.tmpl
index 5e2682c9..b4dd3103 100644
--- a/docgen/proto/templates/html.tmpl
+++ b/docgen/proto/templates/html.tmpl
@@ -1,7 +1,7 @@
<!DOCTYPE html>
{{/*
-template taken from
+template taken from
https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
*/}}
@@ -236,12 +236,12 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
}
h1, h2, h3, h4, h5, h6 {
color: rgb(52 57 175);
-
+
}
h1 {
font-size: 36px;
}
- h3 {
+ h3 {
padding-top: 2ex;
}
pre {
@@ -271,12 +271,14 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
v${version} (Protobuf)
</a>
<ul class="dropdown-menu" aria-labelledby="navbarScrollingDropdown">
+ <li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
<li><hr class="dropdown-divider"/></li>
+ <li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
@@ -285,6 +287,7 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
<li><hr class="dropdown-divider"/></li>
+ <li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>
diff --git a/docgen/xml/xs3p.xsl b/docgen/xml/xs3p.xsl
index b6be726d..a85e3c4d 100644
--- a/docgen/xml/xs3p.xsl
+++ b/docgen/xml/xs3p.xsl
@@ -356,6 +356,7 @@
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
<li style="padding:0"><hr class="dropdown-divider"/></li>
+ <li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>
From 63541da1601df7e82171898118bf2828080b9a6d Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Wed, 22 Jan 2025 09:48:34 +0100
Subject: [PATCH 10/42] tests: enable tests for 1.7
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
.../org/cyclonedx/schema/BaseSchemaVerificationTest.java | 1 +
.../org/cyclonedx/schema/JsonSchemaVerificationTest.java | 2 ++
.../org/cyclonedx/schema/XmlSchemaVerificationTest.java | 2 ++
tools/src/test/js/package.json | 5 +++--
tools/src/test/php/composer.json | 6 +++++-
tools/src/test/proto/test.sh | 1 +
6 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java
index a67565ed..47f1c163 100644
--- a/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java
+++ b/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java
@@ -30,6 +30,7 @@ List<String> getAllResources() throws Exception {
files.addAll(getResources("1.4/"));
files.addAll(getResources("1.5/"));
files.addAll(getResources("1.6/"));
+ files.addAll(getResources("1.7/"));
return files;
}
diff --git a/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java
index 1598c0ae..76cc4671 100644
--- a/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java
+++ b/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java
@@ -45,6 +45,8 @@ Collection<DynamicTest> dynamicTestsWithCollection() throws Exception {
schemaVersion = Version.VERSION_15;
} else if (file.endsWith("-1.6.json")) {
schemaVersion = Version.VERSION_16;
+ } else if (file.endsWith("-1.7.json")) {
+ schemaVersion = Version.VERSION_17;
} else {
schemaVersion = null;
}
diff --git a/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java
index 2d57dd8a..cb71f89c 100644
--- a/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java
+++ b/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java
@@ -55,6 +55,8 @@ Collection<DynamicTest> dynamicTestsWithCollection() throws Exception {
schemaVersion = Version.VERSION_15;
} else if (file.endsWith("-1.6.xml")) {
schemaVersion = Version.VERSION_16;
+ } else if (file.endsWith("-1.7.xml")) {
+ schemaVersion = Version.VERSION_17;
} else {
schemaVersion = null;
}
diff --git a/tools/src/test/js/package.json b/tools/src/test/js/package.json
index 441ef8d7..d1c7dddf 100644
--- a/tools/src/test/js/package.json
+++ b/tools/src/test/js/package.json
@@ -15,9 +15,10 @@
"@types/node": ">=18.3"
},
"scripts": {
- "test": "run-s test:*",
+ "test": "run-s test:\\*",
"test:json-schema-lint": "node -- json-schema-lint-tests.js",
- "test:json-schema-functional": "run-s test:json-schema-functional:*",
+ "test:json-schema-functional": "run-s test:json-schema-functional:\\*",
+ "test:json-schema-functional:1.7": "node -- json-schema-functional-tests.js -v 1.7",
"test:json-schema-functional:1.6": "node -- json-schema-functional-tests.js -v 1.6",
"test:json-schema-functional:1.5": "node -- json-schema-functional-tests.js -v 1.5",
"test:json-schema-functional:1.4": "node -- json-schema-functional-tests.js -v 1.4",
diff --git a/tools/src/test/php/composer.json b/tools/src/test/php/composer.json
index 5a95569f..e13d70a6 100644
--- a/tools/src/test/php/composer.json
+++ b/tools/src/test/php/composer.json
@@ -18,18 +18,21 @@
],
"test:json-schema-lint": "@php -f json-schema-lint-tests.php --",
"test:json-schema-functional": [
+ "@test:json-schema-functional:1.7",
"@test:json-schema-functional:1.6",
"@test:json-schema-functional:1.5",
"@test:json-schema-functional:1.4",
"@test:json-schema-functional:1.3",
"@test:json-schema-functional:1.2"
],
+ "test:json-schema-functional:1.7": "@php -f json-schema-functional-tests.php -- -v 1.7 --",
"test:json-schema-functional:1.6": "@php -f json-schema-functional-tests.php -- -v 1.6 --",
"test:json-schema-functional:1.5": "@php -f json-schema-functional-tests.php -- -v 1.5 --",
"test:json-schema-functional:1.4": "@php -f json-schema-functional-tests.php -- -v 1.4 --",
"test:json-schema-functional:1.3": "@php -f json-schema-functional-tests.php -- -v 1.3 --",
"test:json-schema-functional:1.2": "@php -f json-schema-functional-tests.php -- -v 1.2 --",
"test:xml-schema-functional": [
+ "@test:xml-schema-functional:1.7",
"@test:xml-schema-functional:1.6",
"@test:xml-schema-functional:1.5",
"@test:xml-schema-functional:1.4",
@@ -38,6 +41,7 @@
"@test:xml-schema-functional:1.1",
"@test:xml-schema-functional:1.0"
],
+ "test:xml-schema-functional:1.7": "@php -f xml-schema-functional-tests.php -- -v 1.7 --",
"test:xml-schema-functional:1.6": "@php -f xml-schema-functional-tests.php -- -v 1.6 --",
"test:xml-schema-functional:1.5": "@php -f xml-schema-functional-tests.php -- -v 1.5 --",
"test:xml-schema-functional:1.4": "@php -f xml-schema-functional-tests.php -- -v 1.4 --",
@@ -50,4 +54,4 @@
"test": "run all tests",
"test:json-schema-lint": "lint JSON schema."
}
-}
\ No newline at end of file
+}
diff --git a/tools/src/test/proto/test.sh b/tools/src/test/proto/test.sh
index 8d0c72ad..40a30e24 100755
--- a/tools/src/test/proto/test.sh
+++ b/tools/src/test/proto/test.sh
@@ -72,6 +72,7 @@ function schema-breaking-version () {
--error-format "$LOG_FORMAT"
}
+ compare '1.7' '1.6'
# compare '1.6' '1.5' # <-- possible breaks are acknowledged
# compare '1.5' '1.4' # <-- possible breaks are acknowledged
compare '1.4' '1.3'
From 423729ed1bca1082e3a18942e845b4753895b39f Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Wed, 22 Jan 2025 09:48:52 +0100
Subject: [PATCH 11/42] tests: copy tests from 1.6
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
.../resources/1.7/invalid-bomformat-1.6.json | 9 +
.../1.7/invalid-component-ref-1.6.json | 21 ++
.../1.7/invalid-component-ref-1.6.xml | 25 ++
.../1.7/invalid-component-swid-1.6.json | 19 +
.../1.7/invalid-component-swid-1.6.xml | 11 +
.../1.7/invalid-component-type-1.6.json | 14 +
.../1.7/invalid-component-type-1.6.xml | 9 +
.../resources/1.7/invalid-dependency-1.6.json | 44 +++
.../resources/1.7/invalid-dependency-1.6.xml | 31 ++
.../1.7/invalid-empty-component-1.6.json | 12 +
.../1.7/invalid-empty-component-1.6.xml | 7 +
.../resources/1.7/invalid-hash-alg-1.6.json | 33 ++
.../resources/1.7/invalid-hash-alg-1.6.xml | 16 +
.../resources/1.7/invalid-hash-md5-1.6.json | 33 ++
.../resources/1.7/invalid-hash-md5-1.6.xml | 16 +
.../resources/1.7/invalid-hash-sha1-1.6.json | 33 ++
.../resources/1.7/invalid-hash-sha1-1.6.xml | 16 +
.../1.7/invalid-hash-sha256-1.6.json | 33 ++
.../resources/1.7/invalid-hash-sha256-1.6.xml | 16 +
.../1.7/invalid-hash-sha512-1.6.json | 33 ++
.../resources/1.7/invalid-hash-sha512-1.6.xml | 16 +
.../resources/1.7/invalid-issue-type-1.6.json | 49 +++
.../resources/1.7/invalid-issue-type-1.6.xml | 37 ++
.../1.7/invalid-license-choice-1.6.json | 24 ++
.../1.7/invalid-license-choice-1.6.xml | 26 ++
.../1.7/invalid-license-encoding-1.6.json | 29 ++
.../1.7/invalid-license-encoding-1.6.xml | 27 ++
.../resources/1.7/invalid-license-id-1.6.json | 23 ++
.../resources/1.7/invalid-license-id-1.6.xml | 27 ++
.../1.7/invalid-license-id-count-1.6.xml | 27 ++
...valid-license-missing-id-and-name-1.6.json | 20 ++
...-license-missing-id-and-name-1.6.textproto | 15 +
...nvalid-license-missing-id-and-name-1.6.xml | 13 +
.../1.7/invalid-license-name-count-1.6.xml | 27 ++
.../1.7/invalid-metadata-license-1.6.json | 17 +
.../1.7/invalid-metadata-license-1.6.xml | 11 +
.../1.7/invalid-metadata-timestamp-1.6.json | 11 +
.../1.7/invalid-metadata-timestamp-1.6.xml | 7 +
.../invalid-missing-component-type-1.6.json | 13 +
.../invalid-missing-component-type-1.6.xml | 9 +
.../resources/1.7/invalid-namespace-1.6.xml | 118 ++++++
.../resources/1.7/invalid-patch-type-1.6.json | 49 +++
.../resources/1.7/invalid-patch-type-1.6.xml | 37 ++
.../resources/1.7/invalid-properties-1.6.json | 69 ++++
.../1.7/invalid-properties-1.6.textproto | 48 +++
.../resources/1.7/invalid-properties-1.6.xml | 41 +++
.../test/resources/1.7/invalid-scope-1.6.json | 15 +
.../test/resources/1.7/invalid-scope-1.6.xml | 10 +
.../1.7/invalid-serialnumber-1.6.json | 9 +
.../1.7/invalid-serialnumber-1.6.xml | 118 ++++++
.../1.7/invalid-service-data-1.6.json | 21 ++
.../1.7/invalid-service-data-1.6.xml | 11 +
.../resources/1.7/valid-annotation-1.6.json | 110 ++++++
.../1.7/valid-annotation-1.6.textproto | 97 +++++
.../resources/1.7/valid-annotation-1.6.xml | 87 +++++
.../resources/1.7/valid-assembly-1.6.json | 31 ++
.../1.7/valid-assembly-1.6.textproto | 22 ++
.../test/resources/1.7/valid-assembly-1.6.xml | 25 ++
.../resources/1.7/valid-attestation-1.6.json | 210 +++++++++++
.../1.7/valid-attestation-1.6.textproto | 182 ++++++++++
.../resources/1.7/valid-attestation-1.6.xml | 165 +++++++++
.../src/test/resources/1.7/valid-bom-1.6.json | 298 +++++++++++++++
.../resources/1.7/valid-bom-1.6.textproto | 260 ++++++++++++++
.../src/test/resources/1.7/valid-bom-1.6.xml | 203 +++++++++++
.../1.7/valid-component-data-1.6.json | 30 ++
.../1.7/valid-component-data-1.6.textproto | 25 ++
.../1.7/valid-component-data-1.6.xml | 24 ++
.../1.7/valid-component-hashes-1.6.json | 64 ++++
.../1.7/valid-component-hashes-1.6.textproto | 59 +++
.../1.7/valid-component-hashes-1.6.xml | 23 ++
.../1.7/valid-component-identifiers-1.6.json | 25 ++
.../valid-component-identifiers-1.6.textproto | 18 +
.../1.7/valid-component-identifiers-1.6.xml | 16 +
.../1.7/valid-component-ref-1.6.json | 29 ++
.../1.7/valid-component-ref-1.6.textproto | 24 ++
.../resources/1.7/valid-component-ref-1.6.xml | 19 +
.../1.7/valid-component-swid-1.6.json | 20 ++
.../1.7/valid-component-swid-1.6.textproto | 17 +
.../1.7/valid-component-swid-1.6.xml | 11 +
.../1.7/valid-component-swid-full-1.6.json | 25 ++
.../valid-component-swid-full-1.6.textproto | 22 ++
.../1.7/valid-component-swid-full-1.6.xml | 13 +
.../1.7/valid-component-types-1.6.json | 54 +++
.../1.7/valid-component-types-1.6.textproto | 51 +++
.../1.7/valid-component-types-1.6.xml | 41 +++
.../resources/1.7/valid-compositions-1.6.json | 82 +++++
.../1.7/valid-compositions-1.6.textproto | 65 ++++
.../resources/1.7/valid-compositions-1.6.xml | 65 ++++
.../1.7/valid-cryptography-full-1.6.json | 100 ++++++
.../1.7/valid-cryptography-full-1.6.textproto | 122 +++++++
.../1.7/valid-cryptography-full-1.6.xml | 93 +++++
...valid-cryptography-implementation-1.6.json | 60 ++++
...-cryptography-implementation-1.6.textproto | 71 ++++
.../valid-cryptography-implementation-1.6.xml | 51 +++
.../resources/1.7/valid-dependency-1.6.json | 39 ++
.../1.7/valid-dependency-1.6.textproto | 33 ++
.../resources/1.7/valid-dependency-1.6.xml | 23 ++
.../1.7/valid-empty-components-1.6.json | 9 +
.../1.7/valid-empty-components-1.6.textproto | 6 +
.../1.7/valid-empty-components-1.6.xml | 5 +
.../resources/1.7/valid-evidence-1.6.json | 158 ++++++++
.../1.7/valid-evidence-1.6.textproto | 153 ++++++++
.../test/resources/1.7/valid-evidence-1.6.xml | 136 +++++++
.../1.7/valid-external-elements-1.6.xml | 158 ++++++++
.../1.7/valid-external-reference-1.6.json | 218 +++++++++++
.../valid-external-reference-1.6.textproto | 209 +++++++++++
.../1.7/valid-external-reference-1.6.xml | 77 ++++
.../resources/1.7/valid-formulation-1.6.json | 295 +++++++++++++++
.../1.7/valid-formulation-1.6.textproto | 338 ++++++++++++++++++
.../resources/1.7/valid-formulation-1.6.xml | 251 +++++++++++++
.../1.7/valid-license-expression-1.6.json | 44 +++
.../valid-license-expression-1.6.textproto | 37 ++
.../1.7/valid-license-expression-1.6.xml | 23 ++
.../resources/1.7/valid-license-id-1.6.json | 46 +++
.../1.7/valid-license-id-1.6.textproto | 39 ++
.../resources/1.7/valid-license-id-1.6.xml | 25 ++
.../1.7/valid-license-licensing-1.6.json | 56 +++
.../1.7/valid-license-licensing-1.6.textproto | 54 +++
.../1.7/valid-license-licensing-1.6.xml | 49 +++
.../resources/1.7/valid-license-name-1.6.json | 45 +++
.../1.7/valid-license-name-1.6.textproto | 38 ++
.../resources/1.7/valid-license-name-1.6.xml | 25 ++
.../1.7/valid-machine-learning-1.6.json | 94 +++++
.../1.7/valid-machine-learning-1.6.textproto | 81 +++++
.../1.7/valid-machine-learning-1.6.xml | 92 +++++
...chine-learning-considerations-env-1.6.json | 66 ++++
...-learning-considerations-env-1.6.textproto | 57 +++
...achine-learning-considerations-env-1.6.xml | 57 +++
.../1.7/valid-metadata-author-1.6.json | 17 +
.../1.7/valid-metadata-author-1.6.textproto | 13 +
.../1.7/valid-metadata-author-1.6.xml | 13 +
.../1.7/valid-metadata-license-1.6.json | 25 ++
.../1.7/valid-metadata-license-1.6.textproto | 21 ++
.../1.7/valid-metadata-license-1.6.xml | 17 +
.../1.7/valid-metadata-lifecycle-1.6.json | 22 ++
.../valid-metadata-lifecycle-1.6.textproto | 20 ++
.../1.7/valid-metadata-lifecycle-1.6.xml | 18 +
.../1.7/valid-metadata-manufacture-1.6.json | 24 ++
.../valid-metadata-manufacture-1.6.textproto | 18 +
.../1.7/valid-metadata-manufacture-1.6.xml | 14 +
.../1.7/valid-metadata-manufacturer-1.6.json | 24 ++
.../valid-metadata-manufacturer-1.6.textproto | 18 +
.../1.7/valid-metadata-manufacturer-1.6.xml | 14 +
.../1.7/valid-metadata-supplier-1.6.json | 24 ++
.../1.7/valid-metadata-supplier-1.6.textproto | 18 +
.../1.7/valid-metadata-supplier-1.6.xml | 14 +
.../1.7/valid-metadata-timestamp-1.6.json | 11 +
.../valid-metadata-timestamp-1.6.textproto | 12 +
.../1.7/valid-metadata-timestamp-1.6.xml | 7 +
.../1.7/valid-metadata-tool-1.6.json | 48 +++
.../1.7/valid-metadata-tool-1.6.textproto | 40 +++
.../resources/1.7/valid-metadata-tool-1.6.xml | 35 ++
.../valid-metadata-tool-deprecated-1.6.json | 27 ++
...lid-metadata-tool-deprecated-1.6.textproto | 21 ++
.../valid-metadata-tool-deprecated-1.6.xml | 17 +
.../1.7/valid-minimal-viable-1.6.json | 13 +
.../1.7/valid-minimal-viable-1.6.textproto | 10 +
.../1.7/valid-minimal-viable-1.6.xml | 8 +
.../test/resources/1.7/valid-patch-1.6.json | 89 +++++
.../resources/1.7/valid-patch-1.6.textproto | 74 ++++
.../test/resources/1.7/valid-patch-1.6.xml | 70 ++++
.../resources/1.7/valid-properties-1.6.json | 101 ++++++
.../1.7/valid-properties-1.6.textproto | 84 +++++
.../resources/1.7/valid-properties-1.6.xml | 49 +++
.../1.7/valid-random-attributes-1.6.xml | 118 ++++++
.../1.7/valid-release-notes-1.6.json | 201 +++++++++++
.../1.7/valid-release-notes-1.6.textproto | 168 +++++++++
.../resources/1.7/valid-release-notes-1.6.xml | 154 ++++++++
.../test/resources/1.7/valid-saasbom-1.6.json | 304 ++++++++++++++++
.../resources/1.7/valid-saasbom-1.6.textproto | 237 ++++++++++++
.../test/resources/1.7/valid-saasbom-1.6.xml | 246 +++++++++++++
.../test/resources/1.7/valid-service-1.6.json | 102 ++++++
.../resources/1.7/valid-service-1.6.textproto | 79 ++++
.../test/resources/1.7/valid-service-1.6.xml | 67 ++++
.../1.7/valid-service-empty-objects-1.6.json | 23 ++
.../valid-service-empty-objects-1.6.textproto | 12 +
.../1.7/valid-service-empty-objects-1.6.xml | 16 +
.../resources/1.7/valid-signatures-1.6.json | 79 ++++
.../resources/1.7/valid-standard-1.6.json | 79 ++++
.../1.7/valid-standard-1.6.textproto | 73 ++++
.../test/resources/1.7/valid-standard-1.6.xml | 64 ++++
.../test/resources/1.7/valid-tags-1.6.json | 22 ++
.../resources/1.7/valid-tags-1.6.textproto | 17 +
.../src/test/resources/1.7/valid-tags-1.6.xml | 28 ++
.../1.7/valid-vulnerability-1.6.json | 170 +++++++++
.../1.7/valid-vulnerability-1.6.textproto | 164 +++++++++
.../resources/1.7/valid-vulnerability-1.6.xml | 144 ++++++++
.../resources/1.7/valid-xml-signature-1.6.xml | 177 +++++++++
188 files changed, 11244 insertions(+)
create mode 100644 tools/src/test/resources/1.7/invalid-bomformat-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-component-ref-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-component-ref-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-component-swid-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-component-swid-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-component-type-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-component-type-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-dependency-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-dependency-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-empty-component-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-empty-component-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-hash-alg-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-hash-alg-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-hash-md5-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-hash-md5-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-hash-sha1-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-hash-sha1-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-hash-sha256-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-hash-sha256-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-hash-sha512-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-hash-sha512-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-issue-type-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-issue-type-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-license-choice-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-license-choice-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-license-encoding-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-license-encoding-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-license-id-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-license-id-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-license-id-count-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-license-name-count-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-metadata-license-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-metadata-license-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-missing-component-type-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-missing-component-type-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-namespace-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-patch-type-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-patch-type-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-properties-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-properties-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/invalid-properties-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-scope-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-scope-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-serialnumber-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-serialnumber-1.6.xml
create mode 100644 tools/src/test/resources/1.7/invalid-service-data-1.6.json
create mode 100644 tools/src/test/resources/1.7/invalid-service-data-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-annotation-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-annotation-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-annotation-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-assembly-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-assembly-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-assembly-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-attestation-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-attestation-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-attestation-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-bom-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-bom-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-bom-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-data-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-component-data-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-data-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-hashes-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-component-hashes-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-hashes-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-identifiers-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-component-identifiers-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-identifiers-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-ref-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-component-ref-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-ref-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-swid-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-component-swid-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-swid-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-swid-full-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-component-swid-full-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-swid-full-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-types-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-component-types-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-types-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-compositions-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-compositions-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-compositions-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-cryptography-full-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-cryptography-full-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-cryptography-full-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-dependency-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-dependency-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-dependency-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-empty-components-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-empty-components-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-empty-components-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-evidence-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-evidence-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-evidence-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-external-elements-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-external-reference-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-external-reference-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-external-reference-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-formulation-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-formulation-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-formulation-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-license-expression-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-license-expression-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-license-expression-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-license-id-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-license-id-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-license-id-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-license-licensing-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-license-licensing-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-license-licensing-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-license-name-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-license-name-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-license-name-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-machine-learning-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-machine-learning-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-machine-learning-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-metadata-author-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-metadata-author-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-metadata-author-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-metadata-license-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-metadata-license-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-metadata-license-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-metadata-supplier-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-metadata-supplier-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-metadata-supplier-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-metadata-tool-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-metadata-tool-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-metadata-tool-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-minimal-viable-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-minimal-viable-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-minimal-viable-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-patch-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-patch-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-patch-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-properties-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-properties-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-properties-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-random-attributes-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-release-notes-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-release-notes-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-release-notes-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-saasbom-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-saasbom-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-saasbom-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-service-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-service-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-service-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-service-empty-objects-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-service-empty-objects-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-service-empty-objects-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-signatures-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-standard-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-standard-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-standard-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-tags-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-tags-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-tags-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-vulnerability-1.6.json
create mode 100644 tools/src/test/resources/1.7/valid-vulnerability-1.6.textproto
create mode 100644 tools/src/test/resources/1.7/valid-vulnerability-1.6.xml
create mode 100644 tools/src/test/resources/1.7/valid-xml-signature-1.6.xml
diff --git a/tools/src/test/resources/1.7/invalid-bomformat-1.6.json b/tools/src/test/resources/1.7/invalid-bomformat-1.6.json
new file mode 100644
index 00000000..f4874069
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-bomformat-1.6.json
@@ -0,0 +1,9 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "AnotherFormat",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-component-ref-1.6.json b/tools/src/test/resources/1.7/invalid-component-ref-1.6.json
new file mode 100644
index 00000000..b4856c5d
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-component-ref-1.6.json
@@ -0,0 +1,21 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "bom-ref": "123",
+ "name": "acme-library",
+ "version": "1.0.0"
+ },
+ {
+ "type": "library",
+ "bom-ref": "",
+ "name": "acme-library",
+ "version": "1.0.0"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-component-ref-1.6.xml b/tools/src/test/resources/1.7/invalid-component-ref-1.6.xml
new file mode 100644
index 00000000..770efd83
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-component-ref-1.6.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library" bom-ref="123">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ <components>
+ <component type="library" bom-ref="123">
+ <!-- duplicate value in attribute `bom-ref` -->
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ </component>
+ <component type="library" bom-ref="123">
+ <name>acme-library2</name>
+ <version>1.0.0</version>
+ </component>
+ <component type="library" bom-ref="">
+ <!-- empty value in attribute `bom-ref` -->
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ </component>
+ </components>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-component-swid-1.6.json b/tools/src/test/resources/1.7/invalid-component-swid-1.6.json
new file mode 100644
index 00000000..7acf18d4
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-component-swid-1.6.json
@@ -0,0 +1,19 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "application",
+ "author": "Acme Super Heros",
+ "name": "Acme Application",
+ "version": "9.1.1",
+ "swid": {
+ "name": "Acme Application",
+ "version": "9.1.1"
+ }
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-component-swid-1.6.xml b/tools/src/test/resources/1.7/invalid-component-swid-1.6.xml
new file mode 100644
index 00000000..453d02b9
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-component-swid-1.6.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <author>Acme Super Heros</author>
+ <name>Acme Application</name>
+ <version>9.1.1</version>
+ <swid name="Acme Application" version="9.1.1" />
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-component-type-1.6.json b/tools/src/test/resources/1.7/invalid-component-type-1.6.json
new file mode 100644
index 00000000..bc5dd16a
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-component-type-1.6.json
@@ -0,0 +1,14 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "foo",
+ "name": "acme-library",
+ "version": "1.0.0"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-component-type-1.6.xml b/tools/src/test/resources/1.7/invalid-component-type-1.6.xml
new file mode 100644
index 00000000..cd9738c6
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-component-type-1.6.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="foo">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-dependency-1.6.json b/tools/src/test/resources/1.7/invalid-dependency-1.6.json
new file mode 100644
index 00000000..e46c5ca2
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-dependency-1.6.json
@@ -0,0 +1,44 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "bom-ref": "library-a",
+ "type": "library",
+ "name": "library-a",
+ "version": "1.0.0"
+ },
+ {
+ "bom-ref": "library-b",
+ "type": "library",
+ "name": "library-b",
+ "version": "1.0.0"
+ },
+ {
+ "bom-ref": "library-c",
+ "type": "library",
+ "name": "library-c",
+ "version": "1.0.0"
+ }
+ ],
+ "dependencies": [
+ {
+ "dependsOn": []
+ },
+ {
+ "ref": "",
+ "dependsOn": [
+ "library-a"
+ ]
+ },
+ {
+ "ref": "library-b",
+ "dependsOn": [
+ "library-c"
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-dependency-1.6.xml b/tools/src/test/resources/1.7/invalid-dependency-1.6.xml
new file mode 100644
index 00000000..ae2daa3d
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-dependency-1.6.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library" bom-ref="library-a">
+ <name>acme-library-a</name>
+ <version>1.0.0</version>
+ </component>
+ <component type="library" bom-ref="library-b">
+ <name>acme-library-b</name>
+ <version>1.0.0</version>
+ </component>
+ <component type="library" bom-ref="library-c">
+ <name>acme-library-b</name>
+ <version>1.0.0</version>
+ </component>
+ </components>
+ <dependencies>
+ <dependency>
+ <!-- invalid: missing attribute `ref` -->
+ </dependency>
+ <dependency ref="">
+ <!-- invalid: attribute `ref` is empty -->
+ <dependency ref="library-a"/>
+ </dependency>
+ <dependency ref="library-b">
+ <dependency ref="library-c">
+ <!-- valid -->
+ </dependency>
+ </dependency>
+ </dependencies>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-empty-component-1.6.json b/tools/src/test/resources/1.7/invalid-empty-component-1.6.json
new file mode 100644
index 00000000..ced677ee
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-empty-component-1.6.json
@@ -0,0 +1,12 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-empty-component-1.6.xml b/tools/src/test/resources/1.7/invalid-empty-component-1.6.xml
new file mode 100644
index 00000000..71d9e7ec
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-empty-component-1.6.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-hash-alg-1.6.json b/tools/src/test/resources/1.7/invalid-hash-alg-1.6.json
new file mode 100644
index 00000000..a841909f
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-hash-alg-1.6.json
@@ -0,0 +1,33 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-library",
+ "version": "1.0.0",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "FOO",
+ "content": "3942447fac867ae5cdb3229b658f4d48"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-hash-alg-1.6.xml b/tools/src/test/resources/1.7/invalid-hash-alg-1.6.xml
new file mode 100644
index 00000000..dd45222b
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-hash-alg-1.6.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="FOO">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-hash-md5-1.6.json b/tools/src/test/resources/1.7/invalid-hash-md5-1.6.json
new file mode 100644
index 00000000..37140dfe
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-hash-md5-1.6.json
@@ -0,0 +1,33 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-library",
+ "version": "1.0.0",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "MD5",
+ "content": "foo"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-hash-md5-1.6.xml b/tools/src/test/resources/1.7/invalid-hash-md5-1.6.xml
new file mode 100644
index 00000000..8bf8c526
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-hash-md5-1.6.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">foo</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha1-1.6.json b/tools/src/test/resources/1.7/invalid-hash-sha1-1.6.json
new file mode 100644
index 00000000..ba3ef962
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-hash-sha1-1.6.json
@@ -0,0 +1,33 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-library",
+ "version": "1.0.0",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "MD5",
+ "content": "3942447fac867ae5cdb3229b658f4d48"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "foo"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha1-1.6.xml b/tools/src/test/resources/1.7/invalid-hash-sha1-1.6.xml
new file mode 100644
index 00000000..74f9eb22
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-hash-sha1-1.6.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">foo</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha256-1.6.json b/tools/src/test/resources/1.7/invalid-hash-sha256-1.6.json
new file mode 100644
index 00000000..1944c51d
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-hash-sha256-1.6.json
@@ -0,0 +1,33 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-library",
+ "version": "1.0.0",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "MD5",
+ "content": "3942447fac867ae5cdb3229b658f4d48"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "foo"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha256-1.6.xml b/tools/src/test/resources/1.7/invalid-hash-sha256-1.6.xml
new file mode 100644
index 00000000..bcc3b57b
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-hash-sha256-1.6.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">foo</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha512-1.6.json b/tools/src/test/resources/1.7/invalid-hash-sha512-1.6.json
new file mode 100644
index 00000000..3065415c
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-hash-sha512-1.6.json
@@ -0,0 +1,33 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-library",
+ "version": "1.0.0",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "MD5",
+ "content": "3942447fac867ae5cdb3229b658f4d48"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "foo"
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha512-1.6.xml b/tools/src/test/resources/1.7/invalid-hash-sha512-1.6.xml
new file mode 100644
index 00000000..d28277ca
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-hash-sha512-1.6.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">foo</hash>
+ </hashes>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-issue-type-1.6.json b/tools/src/test/resources/1.7/invalid-issue-type-1.6.json
new file mode 100644
index 00000000..4e05dae0
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-issue-type-1.6.json
@@ -0,0 +1,49 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "group": "com.acme",
+ "name": "sample-library",
+ "version": "1.0.0",
+ "pedigree": {
+ "ancestors": [
+ {
+ "type": "library",
+ "group": "org.example",
+ "name": "sample-library",
+ "version": "1.0.0"
+ }
+ ],
+ "patches": [
+ {
+ "type": "unofficial",
+ "diff": {
+ "text": {
+ "contentType": "text/plain",
+ "encoding": "base64",
+ "content": "blah"
+ },
+ "url": "uri/to/changes.diff"
+ },
+ "resolves": [
+ {
+ "type": "foo",
+ "id": "JIRA-17240",
+ "description": "Great new feature that does something",
+ "source": {
+ "name": "Acme Org",
+ "url": "https://issues.acme.org/17240"
+ }
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-issue-type-1.6.xml b/tools/src/test/resources/1.7/invalid-issue-type-1.6.xml
new file mode 100644
index 00000000..8fbb2fb2
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-issue-type-1.6.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <group>com.acme</group>
+ <name>sample-library</name>
+ <version>1.0.0</version>
+ <pedigree>
+ <ancestors>
+ <component type="library">
+ <group>org.example</group>
+ <name>sample-library</name>
+ <version>1.0.0</version>
+ </component>
+ </ancestors>
+ <patches>
+ <patch type="unofficial">
+ <diff>
+ <text content-type="text/plain" encoding="base64">blah</text>
+ <url>uri/to/changes.diff</url>
+ </diff>
+ <resolves>
+ <issue type="foo">
+ <id>JIRA-17240</id>
+ <description>Great new feature that does something</description>
+ <source>
+ <name>Acme Org</name>
+ <url>https://issues.acme.org/17240</url>
+ </source>
+ </issue>
+ </resolves>
+ </patch>
+ </patches>
+ </pedigree>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-license-choice-1.6.json b/tools/src/test/resources/1.7/invalid-license-choice-1.6.json
new file mode 100644
index 00000000..8977bdad
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-license-choice-1.6.json
@@ -0,0 +1,24 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "publisher": "Acme Inc",
+ "group": "com.acme",
+ "name": "tomcat-catalina",
+ "version": "9.0.14",
+ "licenses": [
+ {
+ "expression": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
+ "license": {
+ "name": "Apache License 2.0"
+ }
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-license-choice-1.6.xml b/tools/src/test/resources/1.7/invalid-license-choice-1.6.xml
new file mode 100644
index 00000000..2c51eefc
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-license-choice-1.6.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ </license>
+ <expression>EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0</expression>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-license-encoding-1.6.json b/tools/src/test/resources/1.7/invalid-license-encoding-1.6.json
new file mode 100644
index 00000000..2c6c074f
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-license-encoding-1.6.json
@@ -0,0 +1,29 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "publisher": "Acme Inc",
+ "group": "com.acme",
+ "name": "tomcat-catalina",
+ "version": "9.0.14",
+ "licenses": [
+ {
+ "license": {
+ "id": "Apache-2.0",
+ "text": {
+ "contentType": "text/plain",
+ "encoding": "base85",
+ "content": "
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License."
+ },
+ "url": "https://www.apache.org/licenses/LICENSE-2.0.txt"
+ }
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-license-encoding-1.6.xml b/tools/src/test/resources/1.7/invalid-license-encoding-1.6.xml
new file mode 100644
index 00000000..9619c6b0
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-license-encoding-1.6.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ <text content-type="text/plain" encoding="base85">
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.</text>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-license-id-1.6.json b/tools/src/test/resources/1.7/invalid-license-id-1.6.json
new file mode 100644
index 00000000..c183abc6
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-license-id-1.6.json
@@ -0,0 +1,23 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "publisher": "Acme Inc",
+ "group": "com.acme",
+ "name": "tomcat-catalina",
+ "version": "9.0.14",
+ "licenses": [
+ {
+ "license": {
+ "id": "Apache-2"
+ }
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-license-id-1.6.xml b/tools/src/test/resources/1.7/invalid-license-id-1.6.xml
new file mode 100644
index 00000000..0497e118
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-license-id-1.6.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2</id>
+ <text content-type="text/plain" encoding="base64">
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.</text>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-license-id-count-1.6.xml b/tools/src/test/resources/1.7/invalid-license-id-count-1.6.xml
new file mode 100644
index 00000000..3c21750a
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-license-id-count-1.6.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>MIT</id>
+ <!-- This was a defect in schema 1.0 and is no longer permitted -->
+ <id>MIT</id>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.json b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.json
new file mode 100644
index 00000000..b70f8f6d
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.json
@@ -0,0 +1,20 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "license-with-no-id-nor-name",
+ "version": "23",
+ "description": "testcase for issue#288",
+ "licenses": [
+ {
+ "license": {}
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.textproto b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.textproto
new file mode 100644
index 00000000..db656e6e
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.textproto
@@ -0,0 +1,15 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "license-with-no-id-nor-name"
+ version: "23"
+ description: "testcase for issue#288"
+ licenses {
+ license {}
+ }
+}
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.xml b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.xml
new file mode 100644
index 00000000..34fff4ec
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>license-with-no-id-nor-name</name>
+ <version>23</version>
+ <description>testcase for issue#288</description>
+ <licenses>
+ <license />
+ </licenses>
+ </component>
+ </components>
+</bom>
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/invalid-license-name-count-1.6.xml b/tools/src/test/resources/1.7/invalid-license-name-count-1.6.xml
new file mode 100644
index 00000000..3e91550d
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-license-name-count-1.6.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <name>Apache License 2.0</name>
+ <!-- This was a defect in schema 1.0 and is no longer permitted -->
+ <name>Apache License 2.0</name>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-metadata-license-1.6.json b/tools/src/test/resources/1.7/invalid-metadata-license-1.6.json
new file mode 100644
index 00000000..9db03c94
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-metadata-license-1.6.json
@@ -0,0 +1,17 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "licenses": [
+ {
+ "license": {
+ "id": "Apache-2"
+ }
+ }
+ ]
+ },
+ "components": []
+}
diff --git a/tools/src/test/resources/1.7/invalid-metadata-license-1.6.xml b/tools/src/test/resources/1.7/invalid-metadata-license-1.6.xml
new file mode 100644
index 00000000..f0f716bb
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-metadata-license-1.6.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <licenses>
+ <license>
+ <id>Apache-2</id>
+ </license>
+ </licenses>
+ </metadata>
+ <components />
+</bom>
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.json b/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.json
new file mode 100644
index 00000000..14bbdee5
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.json
@@ -0,0 +1,11 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "timestamp": "2020-04-13"
+ },
+ "components": []
+}
diff --git a/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.xml b/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.xml
new file mode 100644
index 00000000..db47d8df
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <timestamp>2020-04-07</timestamp>
+ </metadata>
+ <components />
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-missing-component-type-1.6.json b/tools/src/test/resources/1.7/invalid-missing-component-type-1.6.json
new file mode 100644
index 00000000..ea53406f
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-missing-component-type-1.6.json
@@ -0,0 +1,13 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "name": "acme-library",
+ "version": "1.0.0"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-missing-component-type-1.6.xml b/tools/src/test/resources/1.7/invalid-missing-component-type-1.6.xml
new file mode 100644
index 00000000..d467421f
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-missing-component-type-1.6.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component>
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-namespace-1.6.xml b/tools/src/test/resources/1.7/invalid-namespace-1.6.xml
new file mode 100644
index 00000000..9e42be40
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-namespace-1.6.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/12">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ <text content-type="text/plain" encoding="base64">
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.</text>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ <pedigree>
+ <ancestors>
+ <component type="application">
+ <publisher>Apache</publisher>
+ <group>org.apache.tomcat</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Apache Catalina</description>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ </license>
+ </licenses>
+ <purl>pkg:maven/org.apache.tomcat/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </ancestors>
+ <commits>
+ <commit>
+ <uid>7638417db6d59f3c431d3e1f261cc637155684cd</uid>
+ <url>https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd</url>
+ <author>
+ <timestamp>2018-11-07T22:01:45Z</timestamp>
+ <name>John Doe</name>
+ <email>john.doe@example.com</email>
+ </author>
+ <committer>
+ <timestamp>2018-11-07T22:01:45Z</timestamp>
+ <name>Jane Doe</name>
+ <email>jane.doe@example.com</email>
+ </committer>
+ <message>Initial commit</message>
+ </commit>
+ </commits>
+ <notes>Commentary here</notes>
+ </pedigree>
+ </component>
+ <component type="library">
+ <group>org.example</group>
+ <name>mylibrary</name>
+ <version>1.0.0</version>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">2342c2eaf1feb9a80195dbaddf2ebaa3</hash>
+ <hash alg="SHA-1">68b78babe00a053f9e35ec6a2d9080f5b90122b0</hash>
+ <hash alg="SHA-256">708f1f53b41f11f02d12a11b1a38d2905d47b099afc71a0f1124ef8582ec7313</hash>
+ <hash alg="SHA-512">387b7ae16b9cae45f830671541539bf544202faae5aac544a93b7b0a04f5f846fa2f4e81ef3f1677e13aed7496408a441f5657ab6d54423e56bf6f38da124aef</hash>
+ </hashes>
+ <licenses>
+ <expression>EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0</expression>
+ </licenses>
+ <copyright>Copyright Example Inc. All rights reserved.</copyright>
+ <cpe>cpe:/a:example:myapplication:1.0.0</cpe>
+ <purl>pkg:maven/com.example/myapplication@1.0.0?packaging=war</purl>
+ <modified>false</modified>
+ <externalReferences>
+ <reference type="documentation">
+ <url>http://example.org/docs</url>
+ <comment>All component versions are documented here</comment>
+ </reference>
+ <reference type="advisories">
+ <url>http://example.org/security</url>
+ </reference>
+ </externalReferences>
+ </component>
+ <component type="framework">
+ <group>com.example</group>
+ <name>myframework</name>
+ <version>1.0.0</version>
+ <description>Example Inc, enterprise framework</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">cfcb0b64aacd2f81c1cd546543de965a</hash>
+ <hash alg="SHA-1">7fbeef2346c45d565c3341f037bce4e088af8a52</hash>
+ <hash alg="SHA-256">0384db3cec55d86a6898c489fdb75a8e75fe66b26639634983d2f3c3558493d1</hash>
+ <hash alg="SHA-512">854909cdb9e3ca183056837144aab6d8069b377bd66445087cc7157bf0c3f620418705dd0b83bdc2f73a508c2bdb316ca1809d75ee6972d02023a3e7dd655c79</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <name>Some random license</name>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.example/myframework@1.0.0?packaging=war</purl>
+ <modified>false</modified>
+ <externalReferences>
+ <reference type="website">
+ <url>http://example.com/myframework</url>
+ </reference>
+ <reference type="advisories">
+ <url>http://example.com/security</url>
+ </reference>
+ </externalReferences>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-patch-type-1.6.json b/tools/src/test/resources/1.7/invalid-patch-type-1.6.json
new file mode 100644
index 00000000..51de20b1
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-patch-type-1.6.json
@@ -0,0 +1,49 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "group": "com.acme",
+ "name": "sample-library",
+ "version": "1.0.0",
+ "pedigree": {
+ "ancestors": [
+ {
+ "type": "library",
+ "group": "org.example",
+ "name": "sample-library",
+ "version": "1.0.0"
+ }
+ ],
+ "patches": [
+ {
+ "type": "foo",
+ "diff": {
+ "text": {
+ "contentType": "text/plain",
+ "encoding": "base64",
+ "content": "blah"
+ },
+ "url": "uri/to/changes.diff"
+ },
+ "resolves": [
+ {
+ "type": "enhancement",
+ "id": "JIRA-17240",
+ "description": "Great new feature that does something",
+ "source": {
+ "name": "Acme Org",
+ "url": "https://issues.acme.org/17240"
+ }
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-patch-type-1.6.xml b/tools/src/test/resources/1.7/invalid-patch-type-1.6.xml
new file mode 100644
index 00000000..78cff1fd
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-patch-type-1.6.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <group>com.acme</group>
+ <name>sample-library</name>
+ <version>1.0.0</version>
+ <pedigree>
+ <ancestors>
+ <component type="library">
+ <group>org.example</group>
+ <name>sample-library</name>
+ <version>1.0.0</version>
+ </component>
+ </ancestors>
+ <patches>
+ <patch type="foo">
+ <diff>
+ <text content-type="text/plain" encoding="base64">blah</text>
+ <url>uri/to/changes.diff</url>
+ </diff>
+ <resolves>
+ <issue type="enhancement">
+ <id>JIRA-17240</id>
+ <description>Great new feature that does something</description>
+ <source>
+ <name>Acme Org</name>
+ <url>https://issues.acme.org/17240</url>
+ </source>
+ </issue>
+ </resolves>
+ </patch>
+ </patches>
+ </pedigree>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-properties-1.6.json b/tools/src/test/resources/1.7/invalid-properties-1.6.json
new file mode 100644
index 00000000..219544f3
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-properties-1.6.json
@@ -0,0 +1,69 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:bcb403ae-91fa-436e-bc93-84d1078cdeed",
+ "version": 1,
+ "metadata": {
+ "properties": [
+ {
+ "value": "missing a name"
+ },
+ {
+ "unexpected-property": "foo"
+ },
+ {}
+ ]
+ },
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-library",
+ "version": "1.0.0",
+ "licenses": [
+ {
+ "license": {
+ "id": "Apache-2.0",
+ "properties": [
+ {
+ "value": "missing a name"
+ },
+ {
+ "unexpected-property": "foo"
+ },
+ {}
+ ]
+ }
+ }
+ ],
+ "properties": [
+ {
+ "value": "missing a name"
+ },
+ {
+ "unexpected-property": "foo"
+ },
+ {}
+ ]
+ }
+ ],
+ "services": [
+ {
+ "bom-ref": "b2a46a4b-8367-4bae-9820-95557cfe03a8",
+ "group": "org.partner",
+ "name": "Stock ticker service",
+ "endpoints": [
+ "https://partner.org/api/v1/stock"
+ ],
+ "properties": [
+ {
+ "value": "missing a name"
+ },
+ {
+ "unexpected-property": "foo"
+ },
+ {}
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-properties-1.6.textproto b/tools/src/test/resources/1.7/invalid-properties-1.6.textproto
new file mode 100644
index 00000000..a707e762
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-properties-1.6.textproto
@@ -0,0 +1,48 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:bcb403ae-91fa-436e-bc93-84d1078cdeed"
+metadata {
+ properties {
+ value: "missing a name"
+ }
+ properties {
+ # no name and no value
+ }
+}
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "acme-library"
+ version: "1.0.0"
+ licenses {
+ license {
+ id: "Apache-2.0"
+ properties {
+ value: "missing a name"
+ }
+ properties {
+ # no name and no value
+ }
+ }
+ }
+ properties {
+ value: "missing a name"
+ }
+ properties {
+ # no name and no value
+ }
+}
+services {
+ bom_ref: "b2a46a4b-8367-4bae-9820-95557cfe03a8"
+ group: "org.partner"
+ name: "Stock ticker service"
+ endpoints: "https://partner.org/api/v1/stock"
+ properties {
+ value: "missing a name"
+ }
+ properties {
+ # no name and no value
+ }
+}
diff --git a/tools/src/test/resources/1.7/invalid-properties-1.6.xml b/tools/src/test/resources/1.7/invalid-properties-1.6.xml
new file mode 100644
index 00000000..9c54127f
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-properties-1.6.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:bcb403ae-91fa-436e-bc93-84d1078cdeed" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <properties>
+ <property>missing a name</property>
+ <property><!-- no name and no value --></property>
+ </properties>
+ </metadata>
+ <components>
+ <component type="library">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ <properties>
+ <property>missing a name</property>
+ <property><!-- no name and no value --></property>
+ </properties>
+ </license>
+ </licenses>
+ <properties>
+ <property>missing a name</property>
+ <property><!-- no name and no value --></property>
+ </properties>
+ </component>
+ </components>
+ <services>
+ <service bom-ref="b2a46a4b-8367-4bae-9820-95557cfe03a8">
+ <group>org.partner</group>
+ <name>Stock ticker service</name>
+ <endpoints>
+ <endpoint>https://partner.org/api/v1/stock</endpoint>
+ </endpoints>
+ <properties>
+ <property>missing a name</property>
+ <property><!-- no name and no value --></property>
+ </properties>
+ </service>
+ </services>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-scope-1.6.json b/tools/src/test/resources/1.7/invalid-scope-1.6.json
new file mode 100644
index 00000000..dcc78ab5
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-scope-1.6.json
@@ -0,0 +1,15 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-library",
+ "version": "1.0.0",
+ "scope": "foo"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-scope-1.6.xml b/tools/src/test/resources/1.7/invalid-scope-1.6.xml
new file mode 100644
index 00000000..d6e615aa
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-scope-1.6.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ <scope>foo</scope>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-serialnumber-1.6.json b/tools/src/test/resources/1.7/invalid-serialnumber-1.6.json
new file mode 100644
index 00000000..9aea4ae4
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-serialnumber-1.6.json
@@ -0,0 +1,9 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f",
+ "version": 1,
+ "components": [
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-serialnumber-1.6.xml b/tools/src/test/resources/1.7/invalid-serialnumber-1.6.xml
new file mode 100644
index 00000000..10e8ae0f
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-serialnumber-1.6.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ <text content-type="text/plain" encoding="base64">
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.</text>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ <pedigree>
+ <ancestors>
+ <component type="application">
+ <publisher>Apache</publisher>
+ <group>org.apache.tomcat</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Apache Catalina</description>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ </license>
+ </licenses>
+ <purl>pkg:maven/org.apache.tomcat/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </ancestors>
+ <commits>
+ <commit>
+ <uid>7638417db6d59f3c431d3e1f261cc637155684cd</uid>
+ <url>https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd</url>
+ <author>
+ <timestamp>2018-11-07T22:01:45Z</timestamp>
+ <name>John Doe</name>
+ <email>john.doe@example.com</email>
+ </author>
+ <committer>
+ <timestamp>2018-11-07T22:01:45Z</timestamp>
+ <name>Jane Doe</name>
+ <email>jane.doe@example.com</email>
+ </committer>
+ <message>Initial commit</message>
+ </commit>
+ </commits>
+ <notes>Commentary here</notes>
+ </pedigree>
+ </component>
+ <component type="library">
+ <group>org.example</group>
+ <name>mylibrary</name>
+ <version>1.0.0</version>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">2342c2eaf1feb9a80195dbaddf2ebaa3</hash>
+ <hash alg="SHA-1">68b78babe00a053f9e35ec6a2d9080f5b90122b0</hash>
+ <hash alg="SHA-256">708f1f53b41f11f02d12a11b1a38d2905d47b099afc71a0f1124ef8582ec7313</hash>
+ <hash alg="SHA-512">387b7ae16b9cae45f830671541539bf544202faae5aac544a93b7b0a04f5f846fa2f4e81ef3f1677e13aed7496408a441f5657ab6d54423e56bf6f38da124aef</hash>
+ </hashes>
+ <licenses>
+ <expression>EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0</expression>
+ </licenses>
+ <copyright>Copyright Example Inc. All rights reserved.</copyright>
+ <cpe>cpe:/a:example:myapplication:1.0.0</cpe>
+ <purl>pkg:maven/com.example/myapplication@1.0.0?packaging=war</purl>
+ <modified>false</modified>
+ <externalReferences>
+ <reference type="documentation">
+ <url>http://example.org/docs</url>
+ <comment>All component versions are documented here</comment>
+ </reference>
+ <reference type="advisories">
+ <url>http://example.org/security</url>
+ </reference>
+ </externalReferences>
+ </component>
+ <component type="framework">
+ <group>com.example</group>
+ <name>myframework</name>
+ <version>1.0.0</version>
+ <description>Example Inc, enterprise framework</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">cfcb0b64aacd2f81c1cd546543de965a</hash>
+ <hash alg="SHA-1">7fbeef2346c45d565c3341f037bce4e088af8a52</hash>
+ <hash alg="SHA-256">0384db3cec55d86a6898c489fdb75a8e75fe66b26639634983d2f3c3558493d1</hash>
+ <hash alg="SHA-512">854909cdb9e3ca183056837144aab6d8069b377bd66445087cc7157bf0c3f620418705dd0b83bdc2f73a508c2bdb316ca1809d75ee6972d02023a3e7dd655c79</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <name>Some random license</name>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.example/myframework@1.0.0?packaging=war</purl>
+ <modified>false</modified>
+ <externalReferences>
+ <reference type="website">
+ <url>http://example.com/myframework</url>
+ </reference>
+ <reference type="advisories">
+ <url>http://example.com/security</url>
+ </reference>
+ </externalReferences>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-service-data-1.6.json b/tools/src/test/resources/1.7/invalid-service-data-1.6.json
new file mode 100644
index 00000000..9fb86ef6
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-service-data-1.6.json
@@ -0,0 +1,21 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "services": [
+ {
+ "bom-ref": "b2a46a4b-8367-4bae-9820-95557cfe03a8",
+ "name": "Stock ticker service",
+ "authenticated": true,
+ "x-trust-boundary": true,
+ "data": [
+ {
+ "classification": "foo",
+ "flow": "bar"
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-service-data-1.6.xml b/tools/src/test/resources/1.7/invalid-service-data-1.6.xml
new file mode 100644
index 00000000..0d1a2bf3
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-service-data-1.6.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <services>
+ <service bom-ref="b2a46a4b-8367-4bae-9820-95557cfe03a8">
+ <name>Stock ticker service</name>
+ <data>
+ <classification flow="foo">bar</classification>
+ </data>
+ </service>
+ </services>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-annotation-1.6.json b/tools/src/test/resources/1.7/valid-annotation-1.6.json
new file mode 100644
index 00000000..108d5ed8
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-annotation-1.6.json
@@ -0,0 +1,110 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "bom-ref": "component-a",
+ "type": "library",
+ "name": "Component A",
+ "version": "1.0.0"
+ }
+ ],
+ "annotations": [
+ {
+ "bom-ref": "annotation-1",
+ "subjects": [
+ "component-a"
+ ],
+ "annotator": {
+ "organization": {
+ "name": "Acme, Inc.",
+ "url": [
+ "https://example.com"
+ ],
+ "contact": [
+ {
+ "name": "Acme Professional Services",
+ "email": "professional.services@example.com"
+ }
+ ]
+ }
+ },
+ "timestamp": "2022-01-01T00:00:00Z",
+ "text": "This is a sample annotation made by an organization"
+ },
+ {
+ "bom-ref": "annotation-2",
+ "subjects": [
+ "component-a"
+ ],
+ "annotator": {
+ "individual": {
+ "name": "Samantha Wright",
+ "email": "samantha.wright@example.com",
+ "phone": "800-555-1212"
+ }
+ },
+ "timestamp": "2022-01-01T00:00:00Z",
+ "text": "This is a sample annotation made by a person"
+ },
+ {
+ "bom-ref": "annotation-3",
+ "subjects": [
+ "component-a"
+ ],
+ "annotator": {
+ "component": {
+ "type": "application",
+ "name": "Awesome Tool",
+ "version": "9.1.2"
+ }
+ },
+ "timestamp": "2022-01-01T00:00:00Z",
+ "text": "This is a sample annotation made by a component"
+ },
+ {
+ "bom-ref": "annotation-4",
+ "subjects": [
+ "component-a"
+ ],
+ "annotator": {
+ "service": {
+ "bom-ref": "b2a46a4b-8367-4bae-9820-95557cfe03a8",
+ "provider": {
+ "name": "Partner Org",
+ "url": [
+ "https://partner.org"
+ ],
+ "contact" : [
+ {
+ "name": "Support",
+ "email": "support@partner.org",
+ "phone": "800-555-1212"
+ }
+ ]
+ },
+ "group": "org.partner",
+ "name": "BOM Annotation Service",
+ "version": "2020-Q2",
+ "endpoints": [
+ "https://partner.org/api/v1/inspect",
+ "https://partner.org/api/v1/annotate"
+ ],
+ "authenticated": true,
+ "x-trust-boundary": true,
+ "data": [
+ {
+ "classification": "public",
+ "flow": "bi-directional"
+ }
+ ]
+ }
+ },
+ "timestamp": "2022-01-01T00:00:00Z",
+ "text": "This is a sample annotation made by a service"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-annotation-1.6.textproto b/tools/src/test/resources/1.7/valid-annotation-1.6.textproto
new file mode 100644
index 00000000..8db97718
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-annotation-1.6.textproto
@@ -0,0 +1,97 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "component-a"
+ name: "Component A"
+ version: "1.0.0"
+}
+annotations {
+ bom_ref: "annotation-1"
+ subjects: "component-a"
+ annotator: {
+ organization: {
+ name: "Acme, Inc."
+ url: "https://example.com"
+ contact {
+ name: "Acme Professional Services"
+ email: "professional.services@example.com"
+ }
+ }
+ }
+ timestamp {
+ seconds: 1640995200
+ nanos: 0
+ }
+ text: "This is a sample annotation made by an organization"
+}
+annotations {
+ bom_ref: "annotation-2"
+ subjects: "component-a"
+ annotator: {
+ individual {
+ name: "Samantha Wright"
+ email: "samantha.wright@example.com"
+ phone: "800-555-1212"
+ }
+ }
+ timestamp {
+ seconds: 1640995200
+ nanos: 0
+ }
+ text: "This is a sample annotation made by a person"
+}
+annotations {
+ bom_ref: "annotation-3"
+ subjects: "component-a"
+ annotator: {
+ component {
+ type: CLASSIFICATION_APPLICATION
+ name: "Awesome Tool"
+ version: "9.1.2"
+ }
+ }
+ timestamp {
+ seconds: 1640995200
+ nanos: 0
+ }
+ text: "This is a sample annotation made by a component"
+}
+annotations {
+ bom_ref: "annotation-4"
+ subjects: "component-a"
+ annotator: {
+ service {
+ bom_ref: "b2a46a4b-8367-4bae-9820-95557cfe03a8"
+ provider {
+ name: "Partner Org"
+ url: "https://partner.org"
+ contact {
+ name: "Support"
+ email: "support@partner.org"
+ phone: "800-555-1212"
+ }
+ }
+ group: "org.partner"
+ name: "BOM Annotation Service"
+ version: "2020-Q2"
+ endpoints: "https://partner.org/api/v1/inspect"
+ endpoints: "https://partner.org/api/v1/annotate"
+ authenticated: true
+ x_trust_boundary: true
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "public"
+ }
+ }
+ }
+ timestamp {
+ seconds: 1640995200
+ nanos: 0
+ }
+ text: "This is a sample annotation made by a service"
+}
diff --git a/tools/src/test/resources/1.7/valid-annotation-1.6.xml b/tools/src/test/resources/1.7/valid-annotation-1.6.xml
new file mode 100644
index 00000000..c329a23c
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-annotation-1.6.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library" bom-ref="component-a">
+ <name>Component A</name>
+ <version>1.0.0</version>
+ </component>
+ </components>
+ <annotations>
+ <annotation bom-ref="annotation-1">
+ <subjects>
+ <subject ref="component-a"/>
+ </subjects>
+ <annotator>
+ <organization>
+ <name>Acme, Inc.</name>
+ <url>https://example.com</url>
+ <contact>
+ <name>Acme Professional Services</name>
+ <email>professional.services@example.com</email>
+ </contact>
+ </organization>
+ </annotator>
+ <timestamp>2022-01-01T00:00:00Z</timestamp>
+ <text>This is a sample annotation made by an organization</text>
+ </annotation>
+ <annotation bom-ref="annotation-2">
+ <subjects>
+ <subject ref="component-a"/>
+ </subjects>
+ <annotator>
+ <individual>
+ <name>Samantha Wright</name>
+ <email>samantha.wright@example.com</email>
+ <phone>800-555-1212</phone>
+ </individual>
+ </annotator>
+ <timestamp>2022-01-01T00:00:00Z</timestamp>
+ <text>This is a sample annotation made by a person</text>
+ </annotation>
+ <annotation bom-ref="annotation-3">
+ <subjects>
+ <subject ref="component-a"/>
+ </subjects>
+ <annotator>
+ <component type="application">
+ <name>Awesome Tool</name>
+ <version>9.1.2</version>
+ </component>
+ </annotator>
+ <timestamp>2022-01-01T00:00:00Z</timestamp>
+ <text>This is a sample annotation made by a component</text>
+ </annotation>
+ <annotation bom-ref="annotation-4">
+ <subjects>
+ <subject ref="component-a"/>
+ </subjects>
+ <annotator>
+ <service bom-ref="b2a46a4b-8367-4bae-9820-95557cfe03a8">
+ <provider>
+ <name>Partner Org</name>
+ <url>https://partner.org</url>
+ <contact>
+ <name>Support</name>
+ <email>support@partner.org</email>
+ <phone>800-555-1212</phone>
+ </contact>
+ </provider>
+ <group>org.partner</group>
+ <name>BOM Annotation Service</name>
+ <version>2020-Q2</version>
+ <endpoints>
+ <endpoint>https://partner.org/api/v1/inspect</endpoint>
+ <endpoint>https://partner.org/api/v1/annotate</endpoint>
+ </endpoints>
+ <authenticated>true</authenticated>
+ <x-trust-boundary>true</x-trust-boundary>
+ <data>
+ <classification flow="bi-directional">public</classification>
+ </data>
+ </service>
+ </annotator>
+ <timestamp>2022-01-01T00:00:00Z</timestamp>
+ <text>This is a sample annotation made by a service</text>
+ </annotation>
+ </annotations>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-assembly-1.6.json b/tools/src/test/resources/1.7/valid-assembly-1.6.json
new file mode 100644
index 00000000..864e0e4f
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-assembly-1.6.json
@@ -0,0 +1,31 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-library-a",
+ "version": "1.0.0",
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-library-b",
+ "version": "2.0.0"
+ }
+ ]
+ }
+ ],
+ "services": [
+ {
+ "name": "acme-service-a",
+ "services": [
+ {
+ "name": "acme-service-b"
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-assembly-1.6.textproto b/tools/src/test/resources/1.7/valid-assembly-1.6.textproto
new file mode 100644
index 00000000..ea47f51c
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-assembly-1.6.textproto
@@ -0,0 +1,22 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "acme-library-a"
+ version: "1.0.0"
+ components {
+ type: CLASSIFICATION_LIBRARY
+ name: "acme-library-b"
+ version: "2.0.0"
+ }
+}
+services {
+ name: "acme-service-a"
+ services {
+ name: "acme-service-b"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-assembly-1.6.xml b/tools/src/test/resources/1.7/valid-assembly-1.6.xml
new file mode 100644
index 00000000..089ce080
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-assembly-1.6.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>acme-library-a</name>
+ <version>1.0.0</version>
+ <components>
+ <component type="library">
+ <name>acme-library-b</name>
+ <version>2.0.0</version>
+ </component>
+ </components>
+ </component>
+ </components>
+ <services>
+ <service>
+ <name>acme-service-a</name>
+ <services>
+ <service>
+ <name>acme-service-b</name>
+ </service>
+ </services>
+ </service>
+ </services>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-attestation-1.6.json b/tools/src/test/resources/1.7/valid-attestation-1.6.json
new file mode 100644
index 00000000..9caa455d
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-attestation-1.6.json
@@ -0,0 +1,210 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "declarations": {
+ "assessors": [
+ {
+ "bom-ref": "assessor-1",
+ "thirdParty": true,
+ "organization": {
+ "name": "Assessors Inc"
+ }
+ }
+ ],
+ "attestations": [
+ {
+ "summary": "Attestation summary here",
+ "assessor": "assessor-1",
+ "map": [
+ {
+ "requirement": "requirement-1",
+ "claims": [ "claim-1" ],
+ "counterClaims": [ "counterClaim-1" ],
+ "conformance": {
+ "score": 0.8,
+ "rationale": "Conformance rationale here",
+ "mitigationStrategies": [ "mitigationStrategy-1" ]
+ },
+ "confidence": {
+ "score": 1,
+ "rationale": "Confidence rationale here"
+ }
+ }
+ ],
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [ "MIIB...", "MIID..." ],
+ "value": "tqIT..."
+ }
+ }
+ ],
+ "claims": [
+ {
+ "bom-ref": "claim-1",
+ "target": "acme-inc",
+ "predicate": "Predicate here",
+ "mitigationStrategies": [ "mitigationStrategy-1" ],
+ "reasoning": "Reasoning here",
+ "evidence": [ "evidence-1" ],
+ "counterEvidence": [ "counterEvidence-1" ],
+ "externalReferences": [
+ {
+ "type": "issue-tracker",
+ "url": "https://alm.example.com"
+ }
+ ],
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [ "MIIB...", "MIID..." ],
+ "value": "tqIT..."
+ }
+ }
+ ],
+ "evidence": [
+ {
+ "bom-ref": "evidence-1",
+ "propertyName": "internal.com.acme.someProperty",
+ "description": "Description here",
+ "data": [
+ {
+ "name": "Name of the data",
+ "contents": {
+ "attachment": {
+ "content": "Evidence here",
+ "contentType": "text/plain"
+ }
+ },
+ "classification": "PII",
+ "sensitiveData": [ "Describe sensitive data here" ]
+ }
+ ],
+ "created": "2023-04-25T00:00:00+00:00",
+ "expires": "2023-05-25T00:00:00+00:00",
+ "author": {
+ "name": "Mary"
+ },
+ "reviewer": {
+ "name": "Jane"
+ },
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [ "MIIB...", "MIID..." ],
+ "value": "tqIT..."
+ }
+ },
+ {
+ "bom-ref": "counterEvidence-1",
+ "propertyName": "internal.com.acme.someProperty",
+ "description": "Description here",
+ "data": [
+ {
+ "name": "Name of the data",
+ "contents": {
+ "attachment": {
+ "content": "Counter evidence here",
+ "contentType": "text/plain"
+ }
+ },
+ "classification": "Public",
+ "sensitiveData": [ "Describe sensitive data here" ]
+ }
+ ],
+ "created": "2023-04-25T00:00:00+00:00",
+ "expires": "2023-05-25T00:00:00+00:00",
+ "author": {
+ "name": "Mary"
+ },
+ "reviewer": {
+ "name": "Jane"
+ },
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [ "MIIB...", "MIID..." ],
+ "value": "tqIT..."
+ }
+ },
+ {
+ "bom-ref": "mitigationStrategy-1",
+ "propertyName": "internal.com.acme.someProperty",
+ "description": "Description here",
+ "data": [
+ {
+ "name": "Name of the data",
+ "contents": {
+ "attachment": {
+ "content": "Mitigation strategy here",
+ "contentType": "text/plain"
+ }
+ },
+ "classification": "Company Confidential",
+ "sensitiveData": [ "Describe sensitive data here" ]
+ }
+ ],
+ "created": "2023-04-25T00:00:00+00:00",
+ "expires": "2023-05-25T00:00:00+00:00",
+ "author": {
+ "name": "Mary"
+ },
+ "reviewer": {
+ "name": "Jane"
+ },
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [ "MIIB...", "MIID..." ],
+ "value": "tqIT..."
+ }
+ }
+ ],
+ "targets": {
+ "organizations": [
+ {
+ "bom-ref": "acme-inc",
+ "name": "Acme Inc"
+ }
+ ]
+ },
+ "affirmation": {
+ "statement": "I certify, to the best of my knowledge, that all information is correct...",
+ "signatories": [
+ {
+ "name": "Tom",
+ "role": "CEO",
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [ "MIIB...", "MIID..." ],
+ "value": "tqIT..."
+ }
+ },
+ {
+ "name": "Jerry",
+ "role": "COO",
+ "organization": {
+ "name": "Acme Inc"
+ },
+ "externalReference": {
+ "type": "electronic-signature",
+ "url": "https://example.com/coo-sig.png"
+ }
+ }
+ ],
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [ "MIIB...", "MIID..." ],
+ "value": "tqIT..."
+ }
+ },
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [ "MIIB...", "MIID..." ],
+ "value": "tqIT..."
+ }
+ },
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [ "MIIB...", "MIID..." ],
+ "value": "tqIT..."
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-attestation-1.6.textproto b/tools/src/test/resources/1.7/valid-attestation-1.6.textproto
new file mode 100644
index 00000000..0909b277
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-attestation-1.6.textproto
@@ -0,0 +1,182 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+declarations: {
+ assessors: [
+ {
+ bom_ref: "assessor-1"
+ thirdParty: true
+ organization: {
+ name: "Assessors Inc"
+ }
+ }
+ ]
+ attestations: [
+ {
+ summary: "Attestation summary here"
+ assessor: "assessor-1"
+ map: [
+ {
+ requirement: "requirement-1"
+ claims: [ "claim-1" ]
+ counterClaims: [ "counterClaim-1" ]
+ conformance: {
+ score: 0.8,
+ rationale: "Conformance rationale here",
+ mitigationStrategies: [ "mitigationStrategy-1" ]
+ }
+ confidence: {
+ score: 1,
+ rationale: "Confidence rationale here"
+ }
+ }
+ ]
+ }
+ ],
+ claims: [
+ {
+ bom_ref: "claim-1"
+ target: "acme-inc"
+ predicate: "Predicate here"
+ mitigationStrategies: [ "mitigationStrategy-1" ]
+ reasoning: "Reasoning here"
+ evidence: [ "evidence-1" ]
+ counterEvidence: [ "counterEvidence-1" ]
+ externalReferences: [
+ {
+ type: EXTERNAL_REFERENCE_TYPE_ISSUE_TRACKER,
+ url: "https://alm.example.com"
+ }
+ ]
+ }
+ ]
+ evidence: [
+ {
+ bom_ref: "evidence-1"
+ propertyName: "internal.com.acme.someProperty"
+ description: "Description here"
+ data: [
+ {
+ name: "Name of the data"
+ contents: {
+ attachment: {
+ content_type: "text/plain"
+ value: "Evidence here"
+ }
+ }
+ classification: "PII",
+ sensitiveData: [ "Describe sensitive data here" ]
+ }
+ ]
+ created {
+ seconds: 1682380800
+ nanos: 0
+ }
+ expires {
+ seconds: 1684972800
+ nanos: 0
+ }
+ author: {
+ name: "Mary"
+ }
+ reviewer: {
+ name: "Jane"
+ }
+ },
+ {
+ bom_ref: "counterEvidence-1"
+ propertyName: "internal.com.acme.someProperty"
+ description: "Description here"
+ data: [
+ {
+ name: "Name of the data"
+ contents: {
+ attachment: {
+ content_type: "text/plain"
+ value: "Counter evidence here"
+ }
+ }
+ classification: "Public"
+ sensitiveData: [ "Describe sensitive data here" ]
+ }
+ ]
+ created {
+ seconds: 1682380800
+ nanos: 0
+ }
+ expires {
+ seconds: 1684972800
+ nanos: 0
+ }
+ author: {
+ name: "Mary"
+ }
+ reviewer: {
+ name: "Jane"
+ }
+ },
+ {
+ bom_ref: "mitigationStrategy-1"
+ propertyName: "internal.com.acme.someProperty"
+ description: "Description here"
+ data: [
+ {
+ name: "Name of the data"
+ contents: {
+ attachment: {
+ content_type: "text/plain"
+ value: "Mitigation strategy here"
+ }
+ }
+ classification: "Company Confidential"
+ sensitiveData: [ "Describe sensitive data here" ]
+ }
+ ]
+ created {
+ seconds: 1682380800
+ nanos: 0
+ }
+ expires {
+ seconds: 1684972800
+ nanos: 0
+ }
+ author: {
+ name: "Mary"
+ }
+ reviewer: {
+ name: "Jane"
+ }
+ }
+ ],
+ targets: {
+ organizations: [
+ {
+ bom_ref: "acme-inc"
+ name: "Acme Inc"
+ }
+ ]
+ }
+ affirmation: {
+ statement: "I certify, to the best of my knowledge, that all information is correct..."
+ signatories: [
+ {
+ name: "Tom"
+ role: "CEO"
+ },
+ {
+ name: "Jerry"
+ role: "COO"
+ organization: {
+ name: "Acme Inc"
+ }
+ externalReference: {
+ type: EXTERNAL_REFERENCE_TYPE_ELECTRONIC_SIGNATURE
+ url: "https://example.com/coo-sig.png"
+ }
+ }
+ ]
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-attestation-1.6.xml b/tools/src/test/resources/1.7/valid-attestation-1.6.xml
new file mode 100644
index 00000000..4f34748a
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-attestation-1.6.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <declarations>
+ <assessors>
+ <assessor bom-ref="assessor-1">
+ <thirdParty>true</thirdParty>
+ <organization>
+ <name>Assessors Inc</name>
+ </organization>
+ </assessor>
+ </assessors>
+ <attestations>
+ <attestation>
+ <summary>Attestation summary here</summary>
+ <assessor>assessor-1</assessor>
+ <map>
+ <requirement>requirement-1</requirement>
+ <claims>
+ <claim>claim-1</claim>
+ </claims>
+ <counterClaims>
+ <counterClaim>counterClaim-1</counterClaim>
+ </counterClaims>
+ <conformance>
+ <score>0.8</score>
+ <rationale>Conformance rationale here</rationale>
+ <mitigationStrategies>
+ <mitigationStrategy>mitigationStrategy-1</mitigationStrategy>
+ </mitigationStrategies>
+ </conformance>
+ <confidence>
+ <score>1</score>
+ <rationale>Confidence rationale here</rationale>
+ </confidence>
+ </map>
+ <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <!-- XML signature here -->
+ </ds:Signature>
+ </attestation>
+ </attestations>
+ <claims>
+ <claim bom-ref="claim-1">
+ <target>acme-inc</target>
+ <predicate>Predicate here</predicate>
+ <mitigationStrategies>
+ <mitigationStrategy>mitigationStrategy-1</mitigationStrategy>
+ </mitigationStrategies>
+ <reasoning>Reasoning here</reasoning>
+ <evidence>evidence-1</evidence>
+ <counterEvidence>counterEvidence-1</counterEvidence>
+ <externalReferences>
+ <reference type="issue-tracker">
+ <url>https://alm.example.com</url>
+ </reference>
+ </externalReferences>
+ <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <!-- XML signature here -->
+ </ds:Signature>
+ </claim>
+ </claims>
+ <evidence>
+ <evidence bom-ref="evidence-1">
+ <propertyName>internal.com.acme.someProperty</propertyName>
+ <description>Description here</description>
+ <data>
+ <name>Name of the data</name>
+ <contents>
+ <attachment content-type="text/plain">Evidence here</attachment>
+ </contents>
+ <classification>PII</classification>
+ <sensitiveData>Describe sensitive data here</sensitiveData>
+ </data>
+ <created>2023-04-25T00:00:00+00:00</created>
+ <expires>2023-05-25T00:00:00+00:00</expires>
+ <author>
+ <name>Mary</name>
+ </author>
+ <reviewer>
+ <name>Jane</name>
+ </reviewer>
+ <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <!-- XML signature here -->
+ </ds:Signature>
+ </evidence>
+ <evidence bom-ref="counterEvidence-1">
+ <propertyName>internal.com.acme.someProperty</propertyName>
+ <description>Description here</description>
+ <data>
+ <name>Name of the data</name>
+ <contents>
+ <attachment content-type="text/plain">Counter evidence here</attachment>
+ </contents>
+ <classification>Public</classification>
+ <sensitiveData>Describe sensitive data here</sensitiveData>
+ </data>
+ <created>2023-04-25T00:00:00+00:00</created>
+ <expires>2023-05-25T00:00:00+00:00</expires>
+ <author>
+ <name>Mary</name>
+ </author>
+ <reviewer>
+ <name>Jane</name>
+ </reviewer>
+ </evidence>
+ <evidence bom-ref="mitigationStrategy-1">
+ <propertyName>internal.com.acme.someProperty</propertyName>
+ <description>Description here</description>
+ <data>
+ <name>Name of the data</name>
+ <contents>
+ <attachment content-type="text/plain">Mitigation strategy here</attachment>
+ </contents>
+ <classification>Company Confidential</classification>
+ <sensitiveData>Describe sensitive data here</sensitiveData>
+ </data>
+ <created>2023-04-25T00:00:00+00:00</created>
+ <expires>2023-05-25T00:00:00+00:00</expires>
+ <author>
+ <name>Mary</name>
+ </author>
+ <reviewer>
+ <name>Jane</name>
+ </reviewer>
+ </evidence>
+ </evidence>
+ <targets>
+ <organizations>
+ <organization bom-ref="acme-inc">
+ <name>Acme Inc</name>
+ </organization>
+ </organizations>
+ </targets>
+ <affirmation>
+ <statement>I certify, to the best of my knowledge, that all information is correct...</statement>
+ <signatories>
+ <signatory>
+ <name>Tom</name>
+ <role>CEO</role>
+ <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <!-- XML signature here -->
+ </ds:Signature>
+ </signatory>
+ <signatory>
+ <name>Jerry</name>
+ <role>COO</role>
+ <organization>
+ <name>Acme Inc</name>
+ </organization>
+ <externalReference type="electronic-signature">
+ <url>https://example.com/coo-sig.png</url>
+ </externalReference>
+ </signatory>
+ </signatories>
+ <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <!-- XML signature here -->
+ </ds:Signature>
+ </affirmation>
+ <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <!-- XML signature here -->
+ </ds:Signature>
+ </declarations>
+ <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <!-- XML signature here -->
+ </ds:Signature>
+</bom>
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/valid-bom-1.6.json b/tools/src/test/resources/1.7/valid-bom-1.6.json
new file mode 100644
index 00000000..9ab00e7b
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-bom-1.6.json
@@ -0,0 +1,298 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "timestamp": "2020-04-13T20:20:39+00:00",
+ "tools": [
+ {
+ "vendor": "Awesome Vendor",
+ "name": "Awesome Tool",
+ "version": "9.1.2",
+ "hashes": [
+ {
+ "alg": "SHA-1",
+ "content": "25ed8e31b995bb927966616df2a42b979a2717f0"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "a74f733635a19aefb1f73e5947cef59cd7440c6952ef0f03d09d974274cbd6df"
+ }
+ ]
+ }
+ ],
+ "authors": [
+ {
+ "name": "Samantha Wright",
+ "email": "samantha.wright@example.com",
+ "phone": "800-555-1212"
+ }
+ ],
+ "component": {
+ "type": "application",
+ "author": "Acme Super Heros",
+ "name": "Acme Application",
+ "version": "9.1.1",
+ "swid": {
+ "tagId": "swidgen-242eb18a-503e-ca37-393b-cf156ef09691_9.1.1",
+ "name": "Acme Application",
+ "version": "9.1.1",
+ "text": {
+ "contentType": "text/xml",
+ "encoding": "base64",
+ "content": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxTb2Z0d2FyZUlkZW50aXR5IHhtbDpsYW5nPSJFTiIgbmFtZT0iQWNtZSBBcHBsaWNhdGlvbiIgdmVyc2lvbj0iOS4xLjEiIAogdmVyc2lvblNjaGVtZT0ibXVsdGlwYXJ0bnVtZXJpYyIgCiB0YWdJZD0ic3dpZGdlbi1iNTk1MWFjOS00MmMwLWYzODItM2YxZS1iYzdhMmE0NDk3Y2JfOS4xLjEiIAogeG1sbnM9Imh0dHA6Ly9zdGFuZGFyZHMuaXNvLm9yZy9pc28vMTk3NzAvLTIvMjAxNS9zY2hlbWEueHNkIj4gCiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiAKIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL3N0YW5kYXJkcy5pc28ub3JnL2lzby8xOTc3MC8tMi8yMDE1LWN1cnJlbnQvc2NoZW1hLnhzZCBzY2hlbWEueHNkIiA+CiAgPE1ldGEgZ2VuZXJhdG9yPSJTV0lEIFRhZyBPbmxpbmUgR2VuZXJhdG9yIHYwLjEiIC8+IAogIDxFbnRpdHkgbmFtZT0iQWNtZSwgSW5jLiIgcmVnaWQ9ImV4YW1wbGUuY29tIiByb2xlPSJ0YWdDcmVhdG9yIiAvPiAKPC9Tb2Z0d2FyZUlkZW50aXR5Pg=="
+ }
+ }
+ },
+ "manufacturer": {
+ "name": "Acme, Inc.",
+ "url": [
+ "https://example.com"
+ ],
+ "contact": [
+ {
+ "name": "Acme Professional Services",
+ "email": "professional.services@example.com"
+ }
+ ]
+ },
+ "supplier": {
+ "name": "Acme, Inc.",
+ "url": [
+ "https://example.com"
+ ],
+ "contact": [
+ {
+ "name": "Acme Distribution",
+ "email": "distribution@example.com"
+ }
+ ]
+ }
+ },
+ "components": [
+ {
+ "bom-ref": "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar",
+ "type": "application",
+ "author": "Joane Doe et al.",
+ "publisher": "Acme Inc",
+ "group": "com.acme",
+ "name": "tomcat-catalina",
+ "version": "9.0.14",
+ "description": "Modified version of Apache Catalina",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "MD5",
+ "content": "3942447fac867ae5cdb3229b658f4d48"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ ],
+ "licenses": [
+ {
+ "license": {
+ "id": "Apache-2.0",
+ "text": {
+ "contentType": "text/plain",
+ "encoding": "base64",
+ "content": "
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License."
+ },
+ "url": "https://www.apache.org/licenses/LICENSE-2.0.txt"
+ }
+ }
+ ],
+ "purl": "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar",
+ "pedigree": {
+ "ancestors": [
+ {
+ "type": "application",
+ "author": "Apache Super Heros",
+ "publisher": "Apache",
+ "group": "org.apache.tomcat",
+ "name": "tomcat-catalina",
+ "version": "9.0.14",
+ "description": "Apache Catalina",
+ "licenses": [
+ {
+ "license": {
+ "id": "Apache-2.0"
+ }
+ }
+ ],
+ "purl": "pkg:maven/org.apache.tomcat/tomcat-catalina@9.0.14?packaging=jar"
+ }
+ ],
+ "commits": [
+ {
+ "uid": "7638417db6d59f3c431d3e1f261cc637155684cd",
+ "url": "https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd",
+ "author": {
+ "timestamp": "2018-11-13T20:20:39+00:00",
+ "name": "John Doe",
+ "email": "john.doe@example.com"
+ },
+ "committer": {
+ "timestamp": "2018-11-07T22:01:45Z",
+ "name": "Jane Doe",
+ "email": "jane.doe@example.com"
+ },
+ "message": "Initial commit"
+ }
+ ],
+ "notes": "Commentary here"
+ }
+ },
+ {
+ "type": "library",
+ "bom-ref": "pkg:maven/com.example/myapplication@1.0.0?packaging=war",
+ "supplier": {
+ "name": "Example, Inc.",
+ "url": [
+ "https://example.com",
+ "https://example.net"
+ ],
+ "contact": [
+ {
+ "name": "Example Support AMER",
+ "email": "support@example.com",
+ "phone": "800-555-1212"
+ },
+ {
+ "name": "Example Support APAC",
+ "email": "support@apac.example.com"
+ }
+ ]
+ },
+ "manufacturer": {
+ "name": "Example-2, Inc.",
+ "url": [
+ "https://example.org"
+ ],
+ "contact": [
+ {
+ "email": "support@example.org"
+ }
+ ]
+ },
+ "authors": [
+ {
+ "name": "Anthony Edward Stark",
+ "phone": "555-212-970-4133",
+ "email": "ironman@example.org"
+ },
+ {
+ "name": "Peter Benjamin Parker",
+ "email": "spiderman@example.org"
+ }
+ ],
+ "group": "org.example",
+ "name": "mylibrary",
+ "version": "1.0.0",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "MD5",
+ "content": "2342c2eaf1feb9a80195dbaddf2ebaa3"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "68b78babe00a053f9e35ec6a2d9080f5b90122b0"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "708f1f53b41f11f02d12a11b1a38d2905d47b099afc71a0f1124ef8582ec7313"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "387b7ae16b9cae45f830671541539bf544202faae5aac544a93b7b0a04f5f846fa2f4e81ef3f1677e13aed7496408a441f5657ab6d54423e56bf6f38da124aef"
+ }
+ ],
+ "licenses": [
+ {
+ "expression": "EPL-2.0 OR GPL-2.0-with-classpath-exception"
+ }
+ ],
+ "copyright": "Copyright Example Inc. All rights reserved.",
+ "cpe": "cpe:/a:example:myapplication:1.0.0",
+ "purl": "pkg:maven/com.example/myapplication@1.0.0?packaging=war",
+ "modified": false,
+ "externalReferences": [
+ {
+ "url": "http://example.org/docs",
+ "type": "documentation",
+ "comment": "All component versions are documented here"
+ },
+ {
+ "url": "http://example.org/security",
+ "type": "advisories"
+ }
+ ]
+ },
+ {
+ "type": "framework",
+ "author": "Example Super Heros",
+ "group": "com.example",
+ "name": "myframework",
+ "version": "1.0.0",
+ "description": "Example Inc, enterprise framework",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "MD5",
+ "content": "cfcb0b64aacd2f81c1cd546543de965a"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "7fbeef2346c45d565c3341f037bce4e088af8a52"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "0384db3cec55d86a6898c489fdb75a8e75fe66b26639634983d2f3c3558493d1"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "854909cdb9e3ca183056837144aab6d8069b377bd66445087cc7157bf0c3f620418705dd0b83bdc2f73a508c2bdb316ca1809d75ee6972d02023a3e7dd655c79"
+ }
+ ],
+ "licenses": [
+ {
+ "license": {
+ "name": "Some random license"
+ }
+ }
+ ],
+ "purl": "pkg:maven/com.example/myframework@1.0.0?packaging=war",
+ "modified": false,
+ "externalReferences": [
+ {
+ "type": "website",
+ "url": "http://example.com/myframework"
+ },
+ {
+ "type": "advisories",
+ "url": "http://example.com/security"
+ }
+ ]
+ }
+ ],
+ "dependencies": [
+ {
+ "ref": "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar",
+ "dependsOn": [
+ "pkg:maven/com.example/myapplication@1.0.0?packaging=war"
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/valid-bom-1.6.textproto b/tools/src/test/resources/1.7/valid-bom-1.6.textproto
new file mode 100644
index 00000000..7338519c
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-bom-1.6.textproto
@@ -0,0 +1,260 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ timestamp {
+ seconds: 1586809239
+ nanos: 0
+ }
+ tools {
+ vendor: "Awesome Vendor"
+ name: "Awesome Tool"
+ version: "9.1.2"
+ hashes {
+ alg: HASH_ALG_SHA_1
+ value: "25ed8e31b995bb927966616df2a42b979a2717f0"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_256
+ value: "a74f733635a19aefb1f73e5947cef59cd7440c6952ef0f03d09d974274cbd6df"
+ }
+ }
+ authors {
+ name: "Samantha Wright"
+ email: "samantha.wright@example.com"
+ phone: "800-555-1212"
+ }
+ component {
+ type: CLASSIFICATION_APPLICATION
+ author: "Acme Super Heros"
+ name: "Acme Application"
+ version: "9.1.1"
+ swid {
+ tag_id: "swidgen-242eb18a-503e-ca37-393b-cf156ef09691_9.1.1"
+ name: "Acme Application"
+ version: "9.1.1"
+ text {
+ content_type: "text/xml"
+ encoding: "base64"
+ value: "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxTb2Z0d2FyZUlkZW50aXR5IHhtbDpsYW5nPSJFTiIgbmFtZT0iQWNtZSBBcHBsaWNhdGlvbiIgdmVyc2lvbj0iOS4xLjEiIAogdmVyc2lvblNjaGVtZT0ibXVsdGlwYXJ0bnVtZXJpYyIgCiB0YWdJZD0ic3dpZGdlbi1iNTk1MWFjOS00MmMwLWYzODItM2YxZS1iYzdhMmE0NDk3Y2JfOS4xLjEiIAogeG1sbnM9Imh0dHA6Ly9zdGFuZGFyZHMuaXNvLm9yZy9pc28vMTk3NzAvLTIvMjAxNS9zY2hlbWEueHNkIj4gCiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiAKIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL3N0YW5kYXJkcy5pc28ub3JnL2lzby8xOTc3MC8tMi8yMDE1LWN1cnJlbnQvc2NoZW1hLnhzZCBzY2hlbWEueHNkIiA+CiAgPE1ldGEgZ2VuZXJhdG9yPSJTV0lEIFRhZyBPbmxpbmUgR2VuZXJhdG9yIHYwLjEiIC8+IAogIDxFbnRpdHkgbmFtZT0iQWNtZSwgSW5jLiIgcmVnaWQ9ImV4YW1wbGUuY29tIiByb2xlPSJ0YWdDcmVhdG9yIiAvPiAKPC9Tb2Z0d2FyZUlkZW50aXR5Pg=="
+ }
+ }
+ }
+ supplier {
+ name: "Acme, Inc."
+ url: "https://example.com"
+ contact {
+ name: "Acme Distribution"
+ email: "distribution@example.com"
+ }
+ }
+ manufacturer {
+ name: "Acme, Inc."
+ url: "https://example.com"
+ contact {
+ name: "Acme Professional Services"
+ email: "professional.services@example.com"
+ }
+ }
+}
+components {
+ type: CLASSIFICATION_APPLICATION
+ bom_ref: "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+ author: "Joane Doe et al."
+ publisher: "Acme Inc"
+ group: "com.acme"
+ name: "tomcat-catalina"
+ version: "9.0.14"
+ description: "Modified version of Apache Catalina"
+ scope: SCOPE_REQUIRED
+ hashes {
+ alg: HASH_ALG_MD_5
+ value: "3942447fac867ae5cdb3229b658f4d48"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_1
+ value: "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_256
+ value: "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_512
+ value: "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ licenses {
+ license {
+ id: "Apache-2.0"
+ text {
+ content_type: "text/plain"
+ encoding: "base64"
+ value: "
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License."
+ }
+ url: "https://www.apache.org/licenses/LICENSE-2.0.txt"
+ }
+ }
+ purl: "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+ pedigree {
+ ancestors {
+ type: CLASSIFICATION_APPLICATION
+ author: "Apache Super Heros"
+ publisher: "Apache"
+ group: "org.apache.tomcat"
+ name: "tomcat-catalina"
+ version: "9.0.14"
+ description: "Apache Catalina"
+ licenses {
+ license {
+ id: "Apache-2.0"
+ }
+ }
+ purl: "pkg:maven/org.apache.tomcat/tomcat-catalina@9.0.14?packaging=jar"
+ }
+ commits {
+ uid: "7638417db6d59f3c431d3e1f261cc637155684cd"
+ url: "https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd"
+ author {
+ timestamp {
+ seconds: 1542140439
+ nanos: 0
+ }
+ name: "John Doe"
+ email: "john.doe@example.com"
+ }
+ committer {
+ timestamp {
+ seconds: 1541628105
+ nanos: 0
+ }
+ name: "Jane Doe"
+ email: "jane.doe@example.com"
+ }
+ message: "Initial commit"
+ }
+ notes: "Commentary here"
+ }
+}
+components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "pkg:maven/com.example/myapplication@1.0.0?packaging=war"
+ supplier {
+ name: "Example, Inc."
+ url: "https://example.com"
+ url: "https://example.net"
+ contact {
+ name: "Example Support AMER"
+ email: "support@example.com"
+ phone: "800-555-1212"
+ }
+ contact {
+ name: "Example Support APAC"
+ email: "support@apac.example.com"
+ }
+ }
+ group: "org.example"
+ name: "mylibrary"
+ version: "1.0.0"
+ scope: SCOPE_REQUIRED
+ hashes {
+ alg: HASH_ALG_MD_5
+ value: "2342c2eaf1feb9a80195dbaddf2ebaa3"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_1
+ value: "68b78babe00a053f9e35ec6a2d9080f5b90122b0"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_256
+ value: "708f1f53b41f11f02d12a11b1a38d2905d47b099afc71a0f1124ef8582ec7313"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_512
+ value: "387b7ae16b9cae45f830671541539bf544202faae5aac544a93b7b0a04f5f846fa2f4e81ef3f1677e13aed7496408a441f5657ab6d54423e56bf6f38da124aef"
+ }
+ licenses {
+ expression: "EPL-2.0 OR GPL-2.0-with-classpath-exception"
+ }
+ copyright: "Copyright Example Inc. All rights reserved."
+ cpe: "cpe:/a:example:myapplication:1.0.0"
+ purl: "pkg:maven/com.example/myapplication@1.0.0?packaging=war"
+ modified: false
+ external_references: [
+ {
+ url: "http://example.org/docs"
+ type: EXTERNAL_REFERENCE_TYPE_DOCUMENTATION
+ comment: "All component versions are documented here"
+ },
+ {
+ url: "http://example.org/security"
+ type: EXTERNAL_REFERENCE_TYPE_ADVISORIES
+ }
+ ]
+ manufacturer {
+ name: "Example-2, Inc."
+ url: "https://example.org"
+ contact {
+ email: "support@example.org"
+ }
+ }
+ authors {
+ name: "Anthony Edward Stark"
+ email: "ironman@example.org"
+ phone: "555-212-970-4133"
+ }
+ authors {
+ name: "Peter Benjamin Parker"
+ email: "spiderman@example.org"
+ }
+}
+components {
+ type: CLASSIFICATION_FRAMEWORK
+ author: "Example Super Heros"
+ group: "com.example"
+ name: "myframework"
+ version: "1.0.0"
+ description: "Example Inc, enterprise framework"
+ scope: SCOPE_REQUIRED
+ hashes {
+ alg: HASH_ALG_MD_5
+ value: "cfcb0b64aacd2f81c1cd546543de965a"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_1
+ value: "7fbeef2346c45d565c3341f037bce4e088af8a52"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_256
+ value: "0384db3cec55d86a6898c489fdb75a8e75fe66b26639634983d2f3c3558493d1"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_512
+ value: "854909cdb9e3ca183056837144aab6d8069b377bd66445087cc7157bf0c3f620418705dd0b83bdc2f73a508c2bdb316ca1809d75ee6972d02023a3e7dd655c79"
+ }
+ licenses {
+ license {
+ name: "Some random license"
+ }
+ }
+ purl: "pkg:maven/com.example/myframework@1.0.0?packaging=war"
+ modified: false
+ external_references: [
+ {
+ url: "http://example.com/myframework"
+ type: EXTERNAL_REFERENCE_TYPE_WEBSITE
+ },
+ {
+ url: "http://example.com/security"
+ type: EXTERNAL_REFERENCE_TYPE_ADVISORIES
+ }
+ ]
+}
+dependencies {
+ ref: "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+ dependencies {
+ ref: "pkg:maven/com.example/myapplication@1.0.0?packaging=war"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-bom-1.6.xml b/tools/src/test/resources/1.7/valid-bom-1.6.xml
new file mode 100644
index 00000000..5f94ce13
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-bom-1.6.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <timestamp>2020-04-13T20:20:39+00:00</timestamp>
+ <tools>
+ <tool>
+ <vendor>Awesome Vendor</vendor>
+ <name>Awesome Tool</name>
+ <version>9.1.2</version>
+ <hashes>
+ <hash alg="SHA-1">25ed8e31b995bb927966616df2a42b979a2717f0</hash>
+ <hash alg="SHA-256">a74f733635a19aefb1f73e5947cef59cd7440c6952ef0f03d09d974274cbd6df</hash>
+ </hashes>
+ </tool>
+ </tools>
+ <authors>
+ <author>
+ <name>Samantha Wright</name>
+ <email>samantha.wright@example.com</email>
+ <phone>800-555-1212</phone>
+ </author>
+ </authors>
+ <component type="application">
+ <author>Acme Super Heros</author>
+ <name>Acme Application</name>
+ <version>9.1.1</version>
+ <swid tagId="swidgen-242eb18a-503e-ca37-393b-cf156ef09691_9.1.1" name="Acme Application" version="9.1.1">
+ <text content-type="text/xml" encoding="base64">PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxTb2Z0d2FyZUlkZW50aXR5IHhtbDpsYW5nPSJFTiIgbmFtZT0iQWNtZSBBcHBsaWNhdGlvbiIgdmVyc2lvbj0iOS4xLjEiIAogdmVyc2lvblNjaGVtZT0ibXVsdGlwYXJ0bnVtZXJpYyIgCiB0YWdJZD0ic3dpZGdlbi1iNTk1MWFjOS00MmMwLWYzODItM2YxZS1iYzdhMmE0NDk3Y2JfOS4xLjEiIAogeG1sbnM9Imh0dHA6Ly9zdGFuZGFyZHMuaXNvLm9yZy9pc28vMTk3NzAvLTIvMjAxNS9zY2hlbWEueHNkIj4gCiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiAKIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL3N0YW5kYXJkcy5pc28ub3JnL2lzby8xOTc3MC8tMi8yMDE1LWN1cnJlbnQvc2NoZW1hLnhzZCBzY2hlbWEueHNkIiA+CiAgPE1ldGEgZ2VuZXJhdG9yPSJTV0lEIFRhZyBPbmxpbmUgR2VuZXJhdG9yIHYwLjEiIC8+IAogIDxFbnRpdHkgbmFtZT0iQWNtZSwgSW5jLiIgcmVnaWQ9ImV4YW1wbGUuY29tIiByb2xlPSJ0YWdDcmVhdG9yIiAvPiAKPC9Tb2Z0d2FyZUlkZW50aXR5Pg==</text>
+ </swid>
+ </component>
+ <manufacturer>
+ <name>Acme, Inc.</name>
+ <url>https://example.com</url>
+ <contact>
+ <name>Acme Professional Services</name>
+ <email>professional.services@example.com</email>
+ </contact>
+ </manufacturer>
+ <supplier>
+ <name>Acme, Inc.</name>
+ <url>https://example.com</url>
+ <contact>
+ <name>Acme Distribution</name>
+ <email>distribution@example.com</email>
+ </contact>
+ </supplier>
+ </metadata>
+ <components>
+ <component type="application" bom-ref="pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar">
+ <author>Joane Doe et al.</author>
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ <text content-type="text/plain" encoding="base64">
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.</text>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ <pedigree>
+ <ancestors>
+ <component type="application">
+ <author>Apache Super Heros</author>
+ <publisher>Apache</publisher>
+ <group>org.apache.tomcat</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Apache Catalina</description>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ </license>
+ </licenses>
+ <purl>pkg:maven/org.apache.tomcat/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </ancestors>
+ <commits>
+ <commit>
+ <uid>7638417db6d59f3c431d3e1f261cc637155684cd</uid>
+ <url>https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd</url>
+ <author>
+ <timestamp>2018-11-13T20:20:39+00:00</timestamp>
+ <name>John Doe</name>
+ <email>john.doe@example.com</email>
+ </author>
+ <committer>
+ <timestamp>2018-11-07T22:01:45Z</timestamp>
+ <name>Jane Doe</name>
+ <email>jane.doe@example.com</email>
+ </committer>
+ <message>Initial commit</message>
+ </commit>
+ </commits>
+ <notes>Commentary here</notes>
+ </pedigree>
+ </component>
+ <component type="library" bom-ref="pkg:maven/com.example/myapplication@1.0.0?packaging=war">
+ <supplier>
+ <name>Example, Inc.</name>
+ <url>https://example.com</url>
+ <url>https://example.net</url>
+ <contact>
+ <name>Example Support AMER</name>
+ <email>support@example.com</email>
+ <phone>800-555-1212</phone>
+ </contact>
+ <contact>
+ <name>Example Support APAC</name>
+ <email>support@apac.example.com</email>
+ </contact>
+ </supplier>
+ <manufacturer>
+ <name>Example-2, Inc.</name>
+ <url>https://example.org</url>
+ <contact>
+ <email>support@example.org</email>
+ </contact>
+ </manufacturer>
+ <authors>
+ <author>
+ <name>Anthony Edward Stark</name>
+ <email>ironman@example.org</email>
+ <phone>555-212-970-4133</phone>
+ </author>
+ <author>
+ <name>Peter Benjamin Parker</name>
+ <email>spiderman@example.org</email>
+ </author>
+ </authors>
+ <group>org.example</group>
+ <name>mylibrary</name>
+ <version>1.0.0</version>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">2342c2eaf1feb9a80195dbaddf2ebaa3</hash>
+ <hash alg="SHA-1">68b78babe00a053f9e35ec6a2d9080f5b90122b0</hash>
+ <hash alg="SHA-256">708f1f53b41f11f02d12a11b1a38d2905d47b099afc71a0f1124ef8582ec7313</hash>
+ <hash alg="SHA-512">387b7ae16b9cae45f830671541539bf544202faae5aac544a93b7b0a04f5f846fa2f4e81ef3f1677e13aed7496408a441f5657ab6d54423e56bf6f38da124aef</hash>
+ </hashes>
+ <licenses>
+ <expression>EPL-2.0 OR GPL-2.0-with-classpath-exception</expression>
+ </licenses>
+ <copyright>Copyright Example Inc. All rights reserved.</copyright>
+ <cpe>cpe:/a:example:myapplication:1.0.0</cpe>
+ <purl>pkg:maven/com.example/myapplication@1.0.0?packaging=war</purl>
+ <modified>false</modified>
+ <externalReferences>
+ <reference type="documentation">
+ <url>http://example.org/docs</url>
+ <comment>All component versions are documented here</comment>
+ </reference>
+ <reference type="advisories">
+ <url>http://example.org/security</url>
+ </reference>
+ </externalReferences>
+ </component>
+ <component type="framework">
+ <author>Example Super Heros</author>
+ <group>com.example</group>
+ <name>myframework</name>
+ <version>1.0.0</version>
+ <description>Example Inc, enterprise framework</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">cfcb0b64aacd2f81c1cd546543de965a</hash>
+ <hash alg="SHA-1">7fbeef2346c45d565c3341f037bce4e088af8a52</hash>
+ <hash alg="SHA-256">0384db3cec55d86a6898c489fdb75a8e75fe66b26639634983d2f3c3558493d1</hash>
+ <hash alg="SHA-512">854909cdb9e3ca183056837144aab6d8069b377bd66445087cc7157bf0c3f620418705dd0b83bdc2f73a508c2bdb316ca1809d75ee6972d02023a3e7dd655c79</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <name>Some random license</name>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.example/myframework@1.0.0?packaging=war</purl>
+ <modified>false</modified>
+ <externalReferences>
+ <reference type="website">
+ <url>http://example.com/myframework</url>
+ </reference>
+ <reference type="advisories">
+ <url>http://example.com/security</url>
+ </reference>
+ </externalReferences>
+ </component>
+ </components>
+ <dependencies>
+ <dependency ref="pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar">
+ <dependency ref="pkg:maven/com.example/myapplication@1.0.0?packaging=war"/>
+ </dependency>
+ </dependencies>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-data-1.6.json b/tools/src/test/resources/1.7/valid-component-data-1.6.json
new file mode 100644
index 00000000..f78163f9
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-data-1.6.json
@@ -0,0 +1,30 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:1b1bff0e-fdb9-4088-8b9a-1a9f2d9006da",
+ "version": 1,
+ "components": [
+ {
+ "type": "data",
+ "name": "my-configs",
+ "version": "1337",
+ "data": [
+ {
+ "type": "configuration",
+ "name": "app.ini",
+ "contents": {
+ "url": "https://example.com/cfg/1337/app.ini"
+ }
+ },
+ {
+ "type": "other",
+ "name": ".env",
+ "contents": {
+ "url": "https://example.com/cfg/1337/env"
+ }
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-data-1.6.textproto b/tools/src/test/resources/1.7/valid-component-data-1.6.textproto
new file mode 100644
index 00000000..da50b701
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-data-1.6.textproto
@@ -0,0 +1,25 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:1b1bff0e-fdb9-4088-8b9a-1a9f2d9006da"
+components {
+ type: CLASSIFICATION_DATA
+ name: "my-configs"
+ version: "1337"
+ data {
+ type: COMPONENT_DATA_TYPE_CONFIGURATION
+ name: "app.data"
+ contents {
+ url: "https://example.com/cfg/1337/app.ini"
+ }
+ }
+ data {
+ type: COMPONENT_DATA_TYPE_OTHER
+ name: ".env"
+ contents {
+ url: "https://example.com/cfg/1337/env"
+ }
+ }
+}
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/valid-component-data-1.6.xml b/tools/src/test/resources/1.7/valid-component-data-1.6.xml
new file mode 100644
index 00000000..fe89d803
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-data-1.6.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:1b1bff0e-fdb9-4088-8b9a-1a9f2d9006da" version="1"
+ xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="data">
+ <name>my-configs</name>
+ <version>1337</version>
+ <data>
+ <type>configuration</type>
+ <name>app.ini</name>
+ <contents>
+ <url>https://example.com/cfg/1337/app.ini</url>
+ </contents>
+ </data>
+ <data>
+ <type>other</type>
+ <name>.env</name>
+ <contents>
+ <url>https://example.com/cfg/1337/env</url>
+ </contents>
+ </data>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-hashes-1.6.json b/tools/src/test/resources/1.7/valid-component-hashes-1.6.json
new file mode 100644
index 00000000..91d15f58
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-hashes-1.6.json
@@ -0,0 +1,64 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-example",
+ "version": "1.0.0",
+ "hashes": [
+ {
+ "alg": "MD5",
+ "content": "641b6e166f8b33c5e959e2adcc18b1c7"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "9188560f22e0b73070d2efce670c74af2bdf30af"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "d88bc4e70bfb34d18b5542136639acbb26a8ae2429aa1e47489332fb389cc964"
+ },
+ {
+ "alg": "SHA-384",
+ "content": "d4835048a0f57c74b8fb617d5366ab81376fc92bebe9a93bf24ba7f9da6c9aeeb6179f5d1361f6533211b15f3224cbad"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "74a51ff45e4c11df9ba1f0094282c80489649cb157a75fa337992d2d4592a5a1b8cb4525de8db0ae25233553924d76c36e093ea7fa9df4e5b8b07fd2e074efd6"
+ },
+ {
+ "alg": "SHA3-256",
+ "content": "7478c7cf41c883a04ee89f1813f687886d53fa86f791fff90690c6221e3853aa"
+ },
+ {
+ "alg": "SHA3-384",
+ "content": "a1eea7229716487ad2ebe96b2f997a8408f32f14047994fbcc99b49012cf86c96dbd518e5d57a61b0e57dd37dd0b48f5"
+ },
+ {
+ "alg": "SHA3-512",
+ "content": "7d584825bc1767dfabe7e82b45ccb7a1119b145fa17e76b885e71429c706cef0a3171bc6575b968eec5da56a7966c02fec5402fcee55097ac01d40c550de9d20"
+ },
+ {
+ "alg": "BLAKE2b-256",
+ "content": "d8779633380c050bccf4e733b763ab2abd8ad2db60b517d47fd29bbf76433237"
+ },
+ {
+ "alg": "BLAKE2b-384",
+ "content": "e728ba56c2da995a559a178116c594e8bee4894a79ceb4399d8f479e5563cb1942b85936f646d14170717c576b14db7a"
+ },
+ {
+ "alg": "BLAKE2b-512",
+ "content": "f8ce8d612a6c85c96cf7cebc230f6ddef26e6cedcfbc4a41c766033cc08c6ba097d1470948226807fb2d88d2a2b6fc0ff5e5440e93a603086fdd568bafcd1a9d"
+ },
+ {
+ "alg": "BLAKE3",
+ "content": "26cdc7fb3fd65fc3b621a4ef70bc7d2489d5c19e70c76cf7ec20e538df0047cf"
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-hashes-1.6.textproto b/tools/src/test/resources/1.7/valid-component-hashes-1.6.textproto
new file mode 100644
index 00000000..2c74661d
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-hashes-1.6.textproto
@@ -0,0 +1,59 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "acme-example"
+ version: "1.0.0"
+ hashes {
+ alg: HASH_ALG_MD_5
+ value: "641b6e166f8b33c5e959e2adcc18b1c7"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_1
+ value: "9188560f22e0b73070d2efce670c74af2bdf30af"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_256
+ value: "d88bc4e70bfb34d18b5542136639acbb26a8ae2429aa1e47489332fb389cc964"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_384
+ value: "d4835048a0f57c74b8fb617d5366ab81376fc92bebe9a93bf24ba7f9da6c9aeeb6179f5d1361f6533211b15f3224cbad"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_512
+ value: "74a51ff45e4c11df9ba1f0094282c80489649cb157a75fa337992d2d4592a5a1b8cb4525de8db0ae25233553924d76c36e093ea7fa9df4e5b8b07fd2e074efd6"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_3_256
+ value: "7478c7cf41c883a04ee89f1813f687886d53fa86f791fff90690c6221e3853aa"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_3_384
+ value: "a1eea7229716487ad2ebe96b2f997a8408f32f14047994fbcc99b49012cf86c96dbd518e5d57a61b0e57dd37dd0b48f5"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_3_512
+ value: "7d584825bc1767dfabe7e82b45ccb7a1119b145fa17e76b885e71429c706cef0a3171bc6575b968eec5da56a7966c02fec5402fcee55097ac01d40c550de9d20"
+ }
+ hashes {
+ alg: HASH_ALG_BLAKE_2_B_256
+ value: "d8779633380c050bccf4e733b763ab2abd8ad2db60b517d47fd29bbf76433237"
+ }
+ hashes {
+ alg: HASH_ALG_BLAKE_2_B_384
+ value: "e728ba56c2da995a559a178116c594e8bee4894a79ceb4399d8f479e5563cb1942b85936f646d14170717c576b14db7a"
+ }
+ hashes {
+ alg: HASH_ALG_BLAKE_2_B_512
+ value: "f8ce8d612a6c85c96cf7cebc230f6ddef26e6cedcfbc4a41c766033cc08c6ba097d1470948226807fb2d88d2a2b6fc0ff5e5440e93a603086fdd568bafcd1a9d"
+ }
+ hashes {
+ alg: HASH_ALG_BLAKE_3
+ value: "26cdc7fb3fd65fc3b621a4ef70bc7d2489d5c19e70c76cf7ec20e538df0047cf"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-component-hashes-1.6.xml b/tools/src/test/resources/1.7/valid-component-hashes-1.6.xml
new file mode 100644
index 00000000..4e5fcc61
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-hashes-1.6.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>acme-example</name>
+ <version>1.0.0</version>
+ <hashes>
+ <hash alg="MD5">641b6e166f8b33c5e959e2adcc18b1c7</hash>
+ <hash alg="SHA-1">9188560f22e0b73070d2efce670c74af2bdf30af</hash>
+ <hash alg="SHA-256">d88bc4e70bfb34d18b5542136639acbb26a8ae2429aa1e47489332fb389cc964</hash>
+ <hash alg="SHA-384">d4835048a0f57c74b8fb617d5366ab81376fc92bebe9a93bf24ba7f9da6c9aeeb6179f5d1361f6533211b15f3224cbad</hash>
+ <hash alg="SHA-512">74a51ff45e4c11df9ba1f0094282c80489649cb157a75fa337992d2d4592a5a1b8cb4525de8db0ae25233553924d76c36e093ea7fa9df4e5b8b07fd2e074efd6</hash>
+ <hash alg="SHA3-256">7478c7cf41c883a04ee89f1813f687886d53fa86f791fff90690c6221e3853aa</hash>
+ <hash alg="SHA3-384">a1eea7229716487ad2ebe96b2f997a8408f32f14047994fbcc99b49012cf86c96dbd518e5d57a61b0e57dd37dd0b48f5</hash>
+ <hash alg="SHA3-512">7d584825bc1767dfabe7e82b45ccb7a1119b145fa17e76b885e71429c706cef0a3171bc6575b968eec5da56a7966c02fec5402fcee55097ac01d40c550de9d20</hash>
+ <hash alg="BLAKE2b-256">d8779633380c050bccf4e733b763ab2abd8ad2db60b517d47fd29bbf76433237</hash>
+ <hash alg="BLAKE2b-384">e728ba56c2da995a559a178116c594e8bee4894a79ceb4399d8f479e5563cb1942b85936f646d14170717c576b14db7a</hash>
+ <hash alg="BLAKE2b-512">f8ce8d612a6c85c96cf7cebc230f6ddef26e6cedcfbc4a41c766033cc08c6ba097d1470948226807fb2d88d2a2b6fc0ff5e5440e93a603086fdd568bafcd1a9d</hash>
+ <hash alg="BLAKE3">26cdc7fb3fd65fc3b621a4ef70bc7d2489d5c19e70c76cf7ec20e538df0047cf</hash>
+ </hashes>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-identifiers-1.6.json b/tools/src/test/resources/1.7/valid-component-identifiers-1.6.json
new file mode 100644
index 00000000..de0d2a09
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-identifiers-1.6.json
@@ -0,0 +1,25 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "group": "com.example",
+ "name": "acme-library",
+ "version": "1.0.0",
+ "cpe": "cpe:2.3:a:example:acme-library:1.0.0:*:*:*:*:*:*:*",
+ "purl": "pkg:maven/com.example/acme-library@1.0.0",
+ "omniborId": [
+ "gitoid:blob:sha1:261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64",
+ "gitoid:blob:sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
+ ],
+ "swhid": [
+ "swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2",
+ "swh:1:dir:d198bc9d7a6bcf6db04f476d29314f157507d505"
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-identifiers-1.6.textproto b/tools/src/test/resources/1.7/valid-component-identifiers-1.6.textproto
new file mode 100644
index 00000000..46d4fd9f
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-identifiers-1.6.textproto
@@ -0,0 +1,18 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ group: "com.example"
+ name: "acme-library"
+ version: "1.0.0"
+ cpe: "cpe:2.3:a:example:acme-library:1.0.0:*:*:*:*:*:*:*"
+ purl: "pkg:maven/com.example/acme-library@1.0.0"
+ omniborId: "gitoid:blob:sha1:261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64"
+ omniborId: "gitoid:blob:sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
+ swhid: "swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2"
+ swhid: "swh:1:dir:d198bc9d7a6bcf6db04f476d29314f157507d505"
+}
diff --git a/tools/src/test/resources/1.7/valid-component-identifiers-1.6.xml b/tools/src/test/resources/1.7/valid-component-identifiers-1.6.xml
new file mode 100644
index 00000000..bf74b7df
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-identifiers-1.6.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <group>com.example</group>
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ <cpe>cpe:2.3:a:example:acme-library:1.0.0:*:*:*:*:*:*:*</cpe>
+ <purl>pkg:maven/com.example/acme-library@1.0.0</purl>
+ <omniborId>gitoid:blob:sha1:261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64</omniborId>
+ <omniborId>gitoid:blob:sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08</omniborId>
+ <swhid>swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2</swhid>
+ <swhid>swh:1:dir:d198bc9d7a6bcf6db04f476d29314f157507d505</swhid>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-ref-1.6.json b/tools/src/test/resources/1.7/valid-component-ref-1.6.json
new file mode 100644
index 00000000..c31d31e5
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-ref-1.6.json
@@ -0,0 +1,29 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "bom-ref": "123",
+ "name": "acme-library",
+ "version": "1.0.0",
+ "components" : [
+ {
+ "type": "library",
+ "bom-ref": "456",
+ "name": "acme-library",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "type": "library",
+ "bom-ref": "789",
+ "name": "acme-library",
+ "version": "1.0.0"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-ref-1.6.textproto b/tools/src/test/resources/1.7/valid-component-ref-1.6.textproto
new file mode 100644
index 00000000..82060a83
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-ref-1.6.textproto
@@ -0,0 +1,24 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "123"
+ name: "acme-library"
+ version: "1.0.0"
+ components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "456"
+ name: "acme-library"
+ version: "1.0.0"
+ }
+}
+components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "789"
+ name: "acme-library"
+ version: "1.0.0"
+}
diff --git a/tools/src/test/resources/1.7/valid-component-ref-1.6.xml b/tools/src/test/resources/1.7/valid-component-ref-1.6.xml
new file mode 100644
index 00000000..b65c42d1
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-ref-1.6.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library" bom-ref="123">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ <components>
+ <component type="library" bom-ref="456">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ </component>
+ </components>
+ </component>
+ <component type="library" bom-ref="789">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-swid-1.6.json b/tools/src/test/resources/1.7/valid-component-swid-1.6.json
new file mode 100644
index 00000000..bff17b97
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-swid-1.6.json
@@ -0,0 +1,20 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "application",
+ "author": "Acme Super Heros",
+ "name": "Acme Application",
+ "version": "9.1.1",
+ "swid": {
+ "tagId": "swidgen-242eb18a-503e-ca37-393b-cf156ef09691_9.1.1",
+ "name": "Acme Application",
+ "version": "9.1.1"
+ }
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-swid-1.6.textproto b/tools/src/test/resources/1.7/valid-component-swid-1.6.textproto
new file mode 100644
index 00000000..65380733
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-swid-1.6.textproto
@@ -0,0 +1,17 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_APPLICATION
+ author: "Acme Super Heros"
+ name: "Acme Application"
+ version: "9.1.1"
+ swid {
+ tag_id: "swidgen-242eb18a-503e-ca37-393b-cf156ef09691_9.1.1"
+ name: "Acme Application"
+ version: "9.1.1"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-component-swid-1.6.xml b/tools/src/test/resources/1.7/valid-component-swid-1.6.xml
new file mode 100644
index 00000000..3d4a954d
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-swid-1.6.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <author>Acme Super Heros</author>
+ <name>Acme Application</name>
+ <version>9.1.1</version>
+ <swid tagId="swidgen-242eb18a-503e-ca37-393b-cf156ef09691_9.1.1" name="Acme Application" version="9.1.1" />
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-swid-full-1.6.json b/tools/src/test/resources/1.7/valid-component-swid-full-1.6.json
new file mode 100644
index 00000000..e0e83115
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-swid-full-1.6.json
@@ -0,0 +1,25 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "application",
+ "author": "Acme Super Heros",
+ "name": "Acme Application",
+ "version": "9.1.1",
+ "swid": {
+ "tagId": "swidgen-242eb18a-503e-ca37-393b-cf156ef09691_9.1.1",
+ "name": "Acme Application",
+ "version": "9.1.1",
+ "text": {
+ "contentType": "text/xml",
+ "encoding": "base64",
+ "content": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxTb2Z0d2FyZUlkZW50aXR5IHhtbDpsYW5nPSJFTiIgbmFtZT0iQWNtZSBBcHBsaWNhdGlvbiIgdmVyc2lvbj0iOS4xLjEiIAogdmVyc2lvblNjaGVtZT0ibXVsdGlwYXJ0bnVtZXJpYyIgCiB0YWdJZD0ic3dpZGdlbi1iNTk1MWFjOS00MmMwLWYzODItM2YxZS1iYzdhMmE0NDk3Y2JfOS4xLjEiIAogeG1sbnM9Imh0dHA6Ly9zdGFuZGFyZHMuaXNvLm9yZy9pc28vMTk3NzAvLTIvMjAxNS9zY2hlbWEueHNkIj4gCiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiAKIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL3N0YW5kYXJkcy5pc28ub3JnL2lzby8xOTc3MC8tMi8yMDE1LWN1cnJlbnQvc2NoZW1hLnhzZCBzY2hlbWEueHNkIiA+CiAgPE1ldGEgZ2VuZXJhdG9yPSJTV0lEIFRhZyBPbmxpbmUgR2VuZXJhdG9yIHYwLjEiIC8+IAogIDxFbnRpdHkgbmFtZT0iQWNtZSwgSW5jLiIgcmVnaWQ9ImV4YW1wbGUuY29tIiByb2xlPSJ0YWdDcmVhdG9yIiAvPiAKPC9Tb2Z0d2FyZUlkZW50aXR5Pg=="
+ }
+ }
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-swid-full-1.6.textproto b/tools/src/test/resources/1.7/valid-component-swid-full-1.6.textproto
new file mode 100644
index 00000000..5d4e6a0e
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-swid-full-1.6.textproto
@@ -0,0 +1,22 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_APPLICATION
+ author: "Acme Super Heros"
+ name: "Acme Application"
+ version: "9.1.1"
+ swid {
+ tag_id: "swidgen-242eb18a-503e-ca37-393b-cf156ef09691_9.1.1"
+ name: "Acme Application"
+ version: "9.1.1"
+ text {
+ content_type: "text/xml"
+ encoding: "base64"
+ value: "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxTb2Z0d2FyZUlkZW50aXR5IHhtbDpsYW5nPSJFTiIgbmFtZT0iQWNtZSBBcHBsaWNhdGlvbiIgdmVyc2lvbj0iOS4xLjEiIAogdmVyc2lvblNjaGVtZT0ibXVsdGlwYXJ0bnVtZXJpYyIgCiB0YWdJZD0ic3dpZGdlbi1iNTk1MWFjOS00MmMwLWYzODItM2YxZS1iYzdhMmE0NDk3Y2JfOS4xLjEiIAogeG1sbnM9Imh0dHA6Ly9zdGFuZGFyZHMuaXNvLm9yZy9pc28vMTk3NzAvLTIvMjAxNS9zY2hlbWEueHNkIj4gCiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiAKIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL3N0YW5kYXJkcy5pc28ub3JnL2lzby8xOTc3MC8tMi8yMDE1LWN1cnJlbnQvc2NoZW1hLnhzZCBzY2hlbWEueHNkIiA+CiAgPE1ldGEgZ2VuZXJhdG9yPSJTV0lEIFRhZyBPbmxpbmUgR2VuZXJhdG9yIHYwLjEiIC8+IAogIDxFbnRpdHkgbmFtZT0iQWNtZSwgSW5jLiIgcmVnaWQ9ImV4YW1wbGUuY29tIiByb2xlPSJ0YWdDcmVhdG9yIiAvPiAKPC9Tb2Z0d2FyZUlkZW50aXR5Pg=="
+ }
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-component-swid-full-1.6.xml b/tools/src/test/resources/1.7/valid-component-swid-full-1.6.xml
new file mode 100644
index 00000000..f0f7d407
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-swid-full-1.6.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <author>Acme Super Heros</author>
+ <name>Acme Application</name>
+ <version>9.1.1</version>
+ <swid tagId="swidgen-242eb18a-503e-ca37-393b-cf156ef09691_9.1.1" name="Acme Application" version="9.1.1">
+ <text content-type="text/xml" encoding="base64">PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxTb2Z0d2FyZUlkZW50aXR5IHhtbDpsYW5nPSJFTiIgbmFtZT0iQWNtZSBBcHBsaWNhdGlvbiIgdmVyc2lvbj0iOS4xLjEiIAogdmVyc2lvblNjaGVtZT0ibXVsdGlwYXJ0bnVtZXJpYyIgCiB0YWdJZD0ic3dpZGdlbi1iNTk1MWFjOS00MmMwLWYzODItM2YxZS1iYzdhMmE0NDk3Y2JfOS4xLjEiIAogeG1sbnM9Imh0dHA6Ly9zdGFuZGFyZHMuaXNvLm9yZy9pc28vMTk3NzAvLTIvMjAxNS9zY2hlbWEueHNkIj4gCiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiAKIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL3N0YW5kYXJkcy5pc28ub3JnL2lzby8xOTc3MC8tMi8yMDE1LWN1cnJlbnQvc2NoZW1hLnhzZCBzY2hlbWEueHNkIiA+CiAgPE1ldGEgZ2VuZXJhdG9yPSJTV0lEIFRhZyBPbmxpbmUgR2VuZXJhdG9yIHYwLjEiIC8+IAogIDxFbnRpdHkgbmFtZT0iQWNtZSwgSW5jLiIgcmVnaWQ9ImV4YW1wbGUuY29tIiByb2xlPSJ0YWdDcmVhdG9yIiAvPiAKPC9Tb2Z0d2FyZUlkZW50aXR5Pg==</text>
+ </swid>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-types-1.6.json b/tools/src/test/resources/1.7/valid-component-types-1.6.json
new file mode 100644
index 00000000..8b1abd7e
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-types-1.6.json
@@ -0,0 +1,54 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "application",
+ "name": "application-a",
+ "version": "1.0"
+ },
+ {
+ "type": "library",
+ "name": "library-a",
+ "version": "1.0"
+ },
+ {
+ "type": "framework",
+ "name": "framework-a",
+ "version": "1.0"
+ },
+ {
+ "type": "container",
+ "name": "container-a",
+ "version": "1.0"
+ },
+ {
+ "type": "operating-system",
+ "name": "operating-system-a",
+ "version": "1.0"
+ },
+ {
+ "type": "firmware",
+ "name": "firmware-a",
+ "version": "1.0"
+ },
+ {
+ "type": "device",
+ "name": "device-a",
+ "version": "1.0"
+ },
+ {
+ "type": "file",
+ "name": "file-a",
+ "version": "1.0"
+ },
+ {
+ "type": "data",
+ "name": "data-a",
+ "version": "1.0"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-types-1.6.textproto b/tools/src/test/resources/1.7/valid-component-types-1.6.textproto
new file mode 100644
index 00000000..6a5c4311
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-types-1.6.textproto
@@ -0,0 +1,51 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_APPLICATION
+ name: "application-a"
+ version: "1.0"
+}
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "library-a"
+ version: "1.0"
+}
+components {
+ type: CLASSIFICATION_FRAMEWORK
+ name: "framework-a"
+ version: "1.0"
+}
+components {
+ type: CLASSIFICATION_CONTAINER
+ name: "container-a"
+ version: "1.0"
+}
+components {
+ type: CLASSIFICATION_OPERATING_SYSTEM
+ name: "operating-system-a"
+ version: "1.0"
+}
+components {
+ type: CLASSIFICATION_FIRMWARE
+ name: "firmware-a"
+ version: "1.0"
+}
+components {
+ type: CLASSIFICATION_DEVICE
+ name: "device-a"
+ version: "1.0"
+}
+components {
+ type: CLASSIFICATION_FILE
+ name: "file-a"
+ version: "1.0"
+}
+components {
+ type: CLASSIFICATION_DATA
+ name: "data-a"
+ version: "1.0"
+}
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/valid-component-types-1.6.xml b/tools/src/test/resources/1.7/valid-component-types-1.6.xml
new file mode 100644
index 00000000..d8c70784
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-types-1.6.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <name>application-a</name>
+ <version>1.0</version>
+ </component>
+ <component type="library">
+ <name>library-a</name>
+ <version>1.0</version>
+ </component>
+ <component type="framework">
+ <name>framework-a</name>
+ <version>1.0</version>
+ </component>
+ <component type="container">
+ <name>container-a</name>
+ <version>1.0</version>
+ </component>
+ <component type="operating-system">
+ <name>operating-system-a</name>
+ <version>1.0</version>
+ </component>
+ <component type="firmware">
+ <name>firmware-a</name>
+ <version>1.0</version>
+ </component>
+ <component type="device">
+ <name>device-a</name>
+ <version>1.0</version>
+ </component>
+ <component type="file">
+ <name>file-a</name>
+ <version>1.0</version>
+ </component>
+ <component type="data">
+ <name>data-a</name>
+ <version>1.0</version>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-compositions-1.6.json b/tools/src/test/resources/1.7/valid-compositions-1.6.json
new file mode 100644
index 00000000..8b8dcbf3
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-compositions-1.6.json
@@ -0,0 +1,82 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "component": {
+ "bom-ref": "acme-application-1.0",
+ "type": "application",
+ "name": "Acme Application",
+ "version": "1.0"
+ }
+ },
+ "components": [
+ {
+ "bom-ref": "pkg:maven/partner/shaded-library@1.0",
+ "type": "library",
+ "name": "Partner Shaded Library",
+ "version": "1.0",
+ "purl": "pkg:maven/partner/shaded-library@1.0",
+ "components": [
+ {
+ "bom-ref": "pkg:maven/ossproject/library@2.0",
+ "type": "library",
+ "name": "Some Opensource Library",
+ "version": "2.0",
+ "purl": "pkg:maven/ossproject/library@2.0"
+ }
+ ]
+ },
+ {
+ "bom-ref": "pkg:maven/acme/library@3.0",
+ "type": "library",
+ "name": "Acme Library",
+ "version": "3.0",
+ "purl": "pkg:maven/acme/library@3.0"
+ }
+ ],
+ "dependencies": [
+ {
+ "ref": "acme-application-1.0",
+ "dependsOn": [
+ "pkg:maven/partner/shaded-library@1.0",
+ "pkg:maven/acme/library@3.0"
+ ]
+ }
+ ],
+ "vulnerabilities": [
+ {
+ "bom-ref": "vulnerability-1",
+ "id": "ACME-12345",
+ "source": {
+ "name": "Acme Inc"
+ }
+ }
+ ],
+ "compositions": [
+ {
+ "bom-ref": "composition-1",
+ "aggregate": "complete",
+ "assemblies": [
+ "pkg:maven/partner/shaded-library@1.0"
+ ],
+ "dependencies": [
+ "acme-application-1.0"
+ ]
+ },
+ {
+ "aggregate": "unknown",
+ "assemblies": [
+ "pkg:maven/acme/library@3.0"
+ ]
+ },
+ {
+ "aggregate": "incomplete_first_party_only",
+ "vulnerabilities": [
+ "vulnerability-1"
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-compositions-1.6.textproto b/tools/src/test/resources/1.7/valid-compositions-1.6.textproto
new file mode 100644
index 00000000..1218f026
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-compositions-1.6.textproto
@@ -0,0 +1,65 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ component {
+ type: CLASSIFICATION_APPLICATION
+ bom_ref: "acme-application-1.0"
+ name: "Acme Application"
+ version: "1.0"
+ }
+}
+components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "pkg:maven/partner/shaded-library@1.0"
+ name: "Partner Shaded Library"
+ version: "1.0"
+ purl: "pkg:maven/partner/shaded-library@1.0"
+ components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "pkg:maven/ossproject/library@2.0"
+ name: "Some Opensource Library"
+ version: "2.0"
+ purl: "pkg:maven/ossproject/library@2.0"
+ }
+}
+components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "pkg:maven/acme/library@3.0"
+ name: "Acme Library"
+ version: "3.0"
+ purl: "pkg:maven/acme/library@3.0"
+}
+dependencies {
+ ref: "acme-application-1.0"
+ dependencies {
+ ref: "pkg:maven/partner/shaded-library@1.0"
+ }
+ dependencies {
+ ref: "pkg:maven/acme/library@3.0"
+ }
+}
+compositions {
+ bom_ref: "composition-1"
+ aggregate: AGGREGATE_COMPLETE
+ assemblies: "pkg:maven/partner/shaded-library@1.0"
+ dependencies: "acme-application-1.0"
+}
+compositions {
+ aggregate: AGGREGATE_UNKNOWN
+ assemblies: "pkg:maven/acme/library@3.0"
+}
+compositions {
+ aggregate: AGGREGATE_INCOMPLETE_FIRST_PARTY_ONLY,
+ vulnerabilities: "vulnerability-1"
+}
+vulnerabilities {
+ bom_ref: "vulnerability-1"
+ id: "ACME-12345"
+ source: {
+ name: "Acme Inc"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-compositions-1.6.xml b/tools/src/test/resources/1.7/valid-compositions-1.6.xml
new file mode 100644
index 00000000..f99ed830
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-compositions-1.6.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <component type="application" bom-ref="acme-application-1.0">
+ <name>Acme Application</name>
+ <version>1.0</version>
+ </component>
+ </metadata>
+ <components>
+ <component type="library" bom-ref="pkg:maven/partner/shaded-library@1.0">
+ <name>Partner Shaded Library</name>
+ <version>1.0</version>
+ <purl>pkg:maven/partner/shaded-library@1.0</purl>
+ <components>
+ <component type="library" bom-ref="pkg:maven/ossproject/library@2.0">
+ <name>Some Opensource Library</name>
+ <version>2.0</version>
+ <purl>pkg:maven/ossproject/library@2.0</purl>
+ </component>
+ </components>
+ </component>
+ <component type="library" bom-ref="pkg:maven/acme/library@3.0">
+ <name>Acme Library</name>
+ <version>3.0</version>
+ <purl>pkg:maven/acme/library@3.0</purl>
+ </component>
+ </components>
+ <dependencies>
+ <dependency ref="acme-application-1.0">
+ <dependency ref="pkg:maven/partner/shaded-library@1.0"/>
+ <dependency ref="pkg:maven/acme/library@3.0"/>
+ </dependency>
+ </dependencies>
+ <compositions>
+ <composition bom-ref="composition-1">
+ <aggregate>complete</aggregate>
+ <assemblies>
+ <assembly ref="pkg:maven/partner/shaded-library@1.0"/>
+ </assemblies>
+ <dependencies>
+ <dependency ref="acme-application-1.0"/>
+ </dependencies>
+ </composition>
+ <composition>
+ <aggregate>unknown</aggregate>
+ <assemblies>
+ <assembly ref="pkg:maven/acme/library@3.0"/>
+ </assemblies>
+ </composition>
+ <composition>
+ <aggregate>incomplete_first_party_only</aggregate>
+ <vulnerabilities>
+ <vulnerability ref="vulnerability-1"/>
+ </vulnerabilities>
+ </composition>
+ </compositions>
+ <vulnerabilities>
+ <vulnerability bom-ref="vulnerability-1">
+ <id>ACME-12345</id>
+ <source>
+ <name>Acme Inc</name>
+ </source>
+ </vulnerability>
+ </vulnerabilities>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-cryptography-full-1.6.json b/tools/src/test/resources/1.7/valid-cryptography-full-1.6.json
new file mode 100644
index 00000000..ac134465
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-cryptography-full-1.6.json
@@ -0,0 +1,100 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "cryptographic-asset",
+ "bom-ref": "asset-1",
+ "name": "Name here",
+ "cryptoProperties": {
+ "assetType": "algorithm",
+ "algorithmProperties": {
+ "primitive": "ae",
+ "parameterSetIdentifier": "128",
+ "curve": "brainpoolP160r1",
+ "executionEnvironment": "software-plain-ram",
+ "implementationPlatform": "x86_64",
+ "certificationLevel": [ "fips140-1-l4" ],
+ "mode": "gcm",
+ "padding": "pkcs5",
+ "cryptoFunctions": ["keygen", "encrypt", "decrypt", "tag"],
+ "classicalSecurityLevel": 128,
+ "nistQuantumSecurityLevel": 1
+ },
+ "oid": "oid:1.2.3.4.5.6.7.8.9"
+ }
+ },
+ {
+ "type": "cryptographic-asset",
+ "bom-ref": "asset-2",
+ "name": "Name here",
+ "cryptoProperties": {
+ "assetType": "certificate",
+ "certificateProperties": {
+ "subjectName": "Subject name here",
+ "issuerName": "Issuer name here",
+ "notValidBefore": "2022-01-01T00:00:00.000Z",
+ "notValidAfter": "2024-01-01T00:00:00.000Z",
+ "signatureAlgorithmRef": "bom-ref-to-algorithm",
+ "subjectPublicKeyRef": "bom-ref-to-public-key",
+ "certificateFormat": "X.509",
+ "certificateExtension": "crt"
+ },
+ "oid": "oid:1.2.3.4.5.6.7.8.9"
+ }
+ },
+ {
+ "type": "cryptographic-asset",
+ "bom-ref": "asset-3",
+ "name": "Name here",
+ "cryptoProperties": {
+ "assetType": "protocol",
+ "protocolProperties": {
+ "type": "tls",
+ "version": "1.3",
+ "cipherSuites": [
+ {
+ "name": "TLS_DHE_RSA_WITH_AES_128_CCM",
+ "algorithms": [
+ "bom-ref-to-algorithm"
+ ],
+ "identifiers": [
+ "0xC0"
+ ]
+ }
+ ]
+ },
+ "oid": "oid:1.2.3.4.5.6.7.8.9"
+ }
+ },
+ {
+ "type": "cryptographic-asset",
+ "bom-ref": "asset-4",
+ "name": "Name here",
+ "cryptoProperties": {
+ "assetType": "related-crypto-material",
+ "relatedCryptoMaterialProperties": {
+ "type": "private-key",
+ "id": "12345",
+ "state": "active",
+ "algorithmRef": "bom-ref-to-algorithm",
+ "creationDate": "2024-01-01T00:00:00.000Z",
+ "activationDate": "2024-01-02T00:00:00.000Z",
+ "updateDate": "2024-01-03T00:00:00.000Z",
+ "expirationDate": "2024-01-04T00:00:00.000Z",
+ "value": "Value here",
+ "size": 1024,
+ "format": "PEM",
+ "securedBy": {
+ "mechanism": "HSM",
+ "algorithmRef": "bom-ref-to-algorithm"
+ }
+ },
+ "oid": "oid:1.2.3.4.5.6.7.8.9"
+ }
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-cryptography-full-1.6.textproto b/tools/src/test/resources/1.7/valid-cryptography-full-1.6.textproto
new file mode 100644
index 00000000..9af87b05
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-cryptography-full-1.6.textproto
@@ -0,0 +1,122 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components: [
+ {
+ type: CLASSIFICATION_CRYPTOGRAPHIC_ASSET
+ bom_ref: "asset-1"
+ name: "Name here"
+ cryptoProperties: {
+ assetType: CRYPTO_ASSET_TYPE_ALGORITHM
+ algorithmProperties: {
+ primitive: CRYPTO_PRIMITIVE_AE
+ parameterSetIdentifier: "128"
+ curve: "brainpoolP160r1"
+ executionEnvironment: CRYPTO_EXECUTION_ENVIRONMENT_SOFTWARE_PLAIN_RAM
+ implementationPlatform: CRYPTO_IMPLEMENTATION_PLATFORM_X86_64
+ certificationLevel: [ "fips140-1-l4" ]
+ mode: CRYPTO_ALGORITHM_MODE_GCM
+ padding: CRYPTO_ALGORITHM_PADDING_PKCS5
+ cryptoFunctions: [
+ CRYPTO_ALGORITHM_FUNCTION_KEYGEN,
+ CRYPTO_ALGORITHM_FUNCTION_ENCRYPT,
+ CRYPTO_ALGORITHM_FUNCTION_DECRYPT,
+ CRYPTO_ALGORITHM_FUNCTION_TAG
+ ]
+ classicalSecurityLevel: 128
+ nistQuantumSecurityLevel: 1
+ },
+ oid: "oid:1.2.3.4.5.6.7.8.9"
+ }
+ },
+ {
+ type: CLASSIFICATION_CRYPTOGRAPHIC_ASSET
+ bom_ref: "asset-2"
+ name: "Name here"
+ cryptoProperties: {
+ assetType: CRYPTO_ASSET_TYPE_CERTIFICATE
+ certificateProperties: {
+ subjectName: "Subject name here"
+ issuerName: "Issuer name here"
+ notValidBefore {
+ seconds: 1640995200
+ nanos: 0
+ }
+ notValidAfter {
+ seconds: 1704067200
+ nanos: 0
+ }
+ signatureAlgorithmRef: "bom-ref-to-algorithm"
+ subjectPublicKeyRef: "bom-ref-to-public-key"
+ certificateFormat: "X.509"
+ certificateExtension: "crt"
+ }
+ oid: "oid:1.2.3.4.5.6.7.8.9"
+ }
+ },
+ {
+ type: CLASSIFICATION_CRYPTOGRAPHIC_ASSET
+ bom_ref: "asset-3"
+ name: "Name here"
+ cryptoProperties: {
+ assetType: CRYPTO_ASSET_TYPE_PROTOCOL
+ protocolProperties: {
+ type: CRYPTO_PROTOCOL_TYPE_TLS
+ version: "1.3"
+ cipherSuites: [
+ {
+ name: "TLS_DHE_RSA_WITH_AES_128_CCM"
+ algorithms: [
+ "bom-ref-to-algorithm"
+ ]
+ identifiers: [
+ "0xC0"
+ ]
+ }
+ ]
+ }
+ oid: "oid:1.2.3.4.5.6.7.8.9"
+ }
+ },
+ {
+ type: CLASSIFICATION_CRYPTOGRAPHIC_ASSET
+ bom_ref: "asset-4"
+ name: "Name here"
+ cryptoProperties: {
+ assetType: CRYPTO_ASSET_TYPE_RELATED_CRYPTO_MATERIAL
+ relatedCryptoMaterialProperties: {
+ type: CRYPTO_RELATED_TYPE_PRIVATE_KEY
+ id: "12345"
+ state: CRYPTO_RELATED_STATE_ACTIVE
+ algorithmRef: "bom-ref-to-algorithm"
+ creationDate {
+ seconds: 1704067200
+ nanos: 0
+ }
+ activationDate {
+ seconds: 1704153600
+ nanos: 0
+ }
+ updateDate {
+ seconds: 1704240000
+ nanos: 0
+ }
+ expirationDate {
+ seconds: 1704326400
+ nanos: 0
+ }
+ value: "Value here"
+ size: 1024
+ format: "PEM"
+ securedBy: {
+ mechanism: "HSM"
+ algorithmRef: "bom-ref-to-algorithm"
+ }
+ }
+ oid: "oid:1.2.3.4.5.6.7.8.9"
+ }
+ }
+]
diff --git a/tools/src/test/resources/1.7/valid-cryptography-full-1.6.xml b/tools/src/test/resources/1.7/valid-cryptography-full-1.6.xml
new file mode 100644
index 00000000..0e151a34
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-cryptography-full-1.6.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="cryptographic-asset" bom-ref="asset-1">
+ <name>Name here</name>
+ <cryptoProperties>
+ <assetType>algorithm</assetType>
+ <algorithmProperties>
+ <primitive>ae</primitive>
+ <parameterSetIdentifier>128</parameterSetIdentifier>
+ <curve>brainpoolP160r1</curve>
+ <executionEnvironment>software-plain-ram</executionEnvironment>
+ <implementationPlatform>x86_64</implementationPlatform>
+ <certificationLevel>fips140-1-l4</certificationLevel>
+ <mode>gcm</mode>
+ <padding>pkcs5</padding>
+ <cryptoFunctions>
+ <cryptoFunction>keygen</cryptoFunction>
+ <cryptoFunction>encrypt</cryptoFunction>
+ <cryptoFunction>decrypt</cryptoFunction>
+ <cryptoFunction>tag</cryptoFunction>
+ </cryptoFunctions>
+ <classicalSecurityLevel>128</classicalSecurityLevel>
+ <nistQuantumSecurityLevel>1</nistQuantumSecurityLevel>
+ </algorithmProperties>
+ <oid>oid:1.2.3.4.5.6.7.8.9</oid>
+ </cryptoProperties>
+ </component>
+ <component type="cryptographic-asset" bom-ref="asset-2">
+ <name>Name here</name>
+ <cryptoProperties>
+ <assetType>certificate</assetType>
+ <certificateProperties>
+ <subjectName>Subject name here</subjectName>
+ <issuerName>Issuer name here</issuerName>
+ <notValidBefore>2022-01-01T00:00:00.000Z</notValidBefore>
+ <notValidAfter>2024-01-01T00:00:00.000Z</notValidAfter>
+ <signatureAlgorithmRef>bom-ref-to-algorithm</signatureAlgorithmRef>
+ <subjectPublicKeyRef>bom-ref-to-public-key</subjectPublicKeyRef>
+ <certificateFormat>X.509</certificateFormat>
+ <certificateExtension>crt</certificateExtension>
+ </certificateProperties>
+ <oid>oid:1.2.3.4.5.6.7.8.9</oid>
+ </cryptoProperties>
+ </component>
+ <component type="cryptographic-asset" bom-ref="asset-3">
+ <name>Name here</name>
+ <cryptoProperties>
+ <assetType>protocol</assetType>
+ <protocolProperties>
+ <type>tls</type>
+ <version>1.3</version>
+ <cipherSuites>
+ <cipherSuite>
+ <name>TLS_DHE_RSA_WITH_AES_128_CCM</name>
+ <algorithms>
+ <algorithm>bom-ref-to-algorithm</algorithm>
+ </algorithms>
+ <identifiers>
+ <identifier>0xC0</identifier>
+ </identifiers>
+ </cipherSuite>
+ </cipherSuites>
+ </protocolProperties>
+ <oid>oid:1.2.3.4.5.6.7.8.9</oid>
+ </cryptoProperties>
+ </component>
+ <component type="cryptographic-asset" bom-ref="asset-4">
+ <name>Name here</name>
+ <cryptoProperties>
+ <assetType>related-crypto-material</assetType>
+ <relatedCryptoMaterialProperties>
+ <type>private-key</type>
+ <id>12345</id>
+ <state>active</state>
+ <algorithmRef>bom-ref-to-algorithm</algorithmRef>
+ <creationDate>2024-01-01T00:00:00.000Z</creationDate>
+ <activationDate>2024-01-02T00:00:00.000Z</activationDate>
+ <updateDate>2024-01-03T00:00:00.000Z</updateDate>
+ <expirationDate>2024-01-04T00:00:00.000Z</expirationDate>
+ <value>Value here</value>
+ <size>1024</size>
+ <format>PEM</format>
+ <securedBy>
+ <mechanism>HSM</mechanism>
+ <algorithmRef>bom-ref-to-algorithm</algorithmRef>
+ </securedBy>
+ </relatedCryptoMaterialProperties>
+ <oid>oid:1.2.3.4.5.6.7.8.9</oid>
+ </cryptoProperties>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.json b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.json
new file mode 100644
index 00000000..a143b9b3
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.json
@@ -0,0 +1,60 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "component": {
+ "type": "application",
+ "bom-ref": "acme-application",
+ "name": "Acme Application",
+ "version": "1.0"
+ }
+ },
+ "components": [
+ {
+ "type": "cryptographic-asset",
+ "bom-ref": "aes128gcm",
+ "name": "AES",
+ "cryptoProperties": {
+ "assetType": "algorithm",
+ "algorithmProperties": {
+ "primitive": "ae",
+ "parameterSetIdentifier": "128",
+ "executionEnvironment": "software-plain-ram",
+ "implementationPlatform": "x86_64",
+ "certificationLevel": [ "none" ],
+ "mode": "gcm",
+ "cryptoFunctions": ["keygen", "encrypt", "decrypt", "tag"],
+ "classicalSecurityLevel": 128,
+ "nistQuantumSecurityLevel": 1
+ },
+ "oid": "oid:2.16.840.1.101.3.4.1.6"
+ }
+ },
+ {
+ "type": "library",
+ "bom-ref": "crypto-library",
+ "name": "Crypto library",
+ "version": "1.0.0"
+ },
+ {
+ "type": "library",
+ "bom-ref": "some-library",
+ "name": "Some library",
+ "version": "1.0.0"
+ }
+ ],
+ "dependencies": [
+ {
+ "ref": "acme-application",
+ "dependsOn": ["crypto-library"]
+ },
+ {
+ "ref": "crypto-library",
+ "provides": ["aes128gcm"],
+ "dependsOn": ["some-library"]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.textproto b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.textproto
new file mode 100644
index 00000000..de14145f
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.textproto
@@ -0,0 +1,71 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+# proto-file: schema/bom-1.6.proto
+# proto-message:
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata: {
+ component: {
+ type: CLASSIFICATION_APPLICATION
+ bom_ref: "acme-application"
+ name: "Acme Application"
+ version: "1.0"
+ }
+}
+components: [
+ {
+ type: CLASSIFICATION_CRYPTOGRAPHIC_ASSET
+ bom_ref: "aes128gcm"
+ name: "AES"
+ cryptoProperties: {
+ assetType: CRYPTO_ASSET_TYPE_ALGORITHM
+ algorithmProperties: {
+ primitive: CRYPTO_PRIMITIVE_AE
+ parameterSetIdentifier: "128"
+ executionEnvironment: CRYPTO_EXECUTION_ENVIRONMENT_SOFTWARE_PLAIN_RAM
+ implementationPlatform: CRYPTO_IMPLEMENTATION_PLATFORM_X86_64
+ certificationLevel: [ "none" ],
+ mode: CRYPTO_ALGORITHM_MODE_GCM
+ cryptoFunctions: [
+ CRYPTO_ALGORITHM_FUNCTION_KEYGEN,
+ CRYPTO_ALGORITHM_FUNCTION_ENCRYPT,
+ CRYPTO_ALGORITHM_FUNCTION_DECRYPT,
+ CRYPTO_ALGORITHM_FUNCTION_TAG
+ ]
+ classicalSecurityLevel: 128
+ nistQuantumSecurityLevel: 1
+ },
+ oid: "oid:2.16.840.1.101.3.4.1.6"
+ }
+ },
+ {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "crypto-library"
+ name: "Crypto library"
+ version: "1.0.0"
+ },
+ {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "some-library"
+ name: "Some library"
+ version: "1.0.0"
+ }
+],
+dependencies: [
+ {
+ ref: "acme-application"
+ dependencies {
+ ref: "crypto-library"
+ }
+ },
+ {
+ ref: "crypto-library"
+ provides: [ "aes128gcm" ]
+ dependencies {
+ ref: "some-library"
+ }
+ }
+]
diff --git a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.xml b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.xml
new file mode 100644
index 00000000..e86ae594
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <component type="application" bom-ref="acme-application">
+ <name>Acme Application</name>
+ <version>1.0</version>
+ </component>
+ </metadata>
+ <components>
+ <component type="cryptographic-asset" bom-ref="aes128gcm">
+ <name>AES</name>
+ <cryptoProperties>
+ <assetType>algorithm</assetType>
+ <algorithmProperties>
+ <primitive>ae</primitive>
+ <parameterSetIdentifier>128</parameterSetIdentifier>
+ <executionEnvironment>software-plain-ram</executionEnvironment>
+ <implementationPlatform>x86_64</implementationPlatform>
+ <certificationLevel>none</certificationLevel>
+ <mode>gcm</mode>
+ <cryptoFunctions>
+ <cryptoFunction>keygen</cryptoFunction>
+ <cryptoFunction>encrypt</cryptoFunction>
+ <cryptoFunction>decrypt</cryptoFunction>
+ <cryptoFunction>tag</cryptoFunction>
+ </cryptoFunctions>
+ <classicalSecurityLevel>128</classicalSecurityLevel>
+ <nistQuantumSecurityLevel>1</nistQuantumSecurityLevel>
+ </algorithmProperties>
+ <oid>oid:2.16.840.1.101.3.4.1.6</oid>
+ </cryptoProperties>
+ </component>
+ <component type="library" bom-ref="crypto-library">
+ <name>Crypto library</name>
+ <version>1.0.0</version>
+ </component>
+ <component type="library" bom-ref="some-library">
+ <name>Some library</name>
+ <version>1.0.0</version>
+ </component>
+ </components>
+ <dependencies>
+ <dependency ref="acme-application">
+ <dependency ref="crypto-library"/>
+ </dependency>
+ <dependency ref="crypto-library">
+ <provides ref="aes128gcm"/>
+ <dependency ref="some-library"/>
+ </dependency>
+ </dependencies>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-dependency-1.6.json b/tools/src/test/resources/1.7/valid-dependency-1.6.json
new file mode 100644
index 00000000..1e87f38e
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-dependency-1.6.json
@@ -0,0 +1,39 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "bom-ref": "library-a",
+ "type": "library",
+ "name": "library-a",
+ "version": "1.0.0"
+ },
+ {
+ "bom-ref": "library-b",
+ "type": "library",
+ "name": "library-b",
+ "version": "1.0.0"
+ },
+ {
+ "bom-ref": "library-c",
+ "type": "library",
+ "name": "library-c",
+ "version": "1.0.0"
+ }
+ ],
+ "dependencies": [
+ {
+ "ref": "library-a",
+ "dependsOn": []
+ },
+ {
+ "ref": "library-b",
+ "dependsOn": [
+ "library-c"
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-dependency-1.6.textproto b/tools/src/test/resources/1.7/valid-dependency-1.6.textproto
new file mode 100644
index 00000000..363dfba9
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-dependency-1.6.textproto
@@ -0,0 +1,33 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "library-a"
+ name: "library-a"
+ version: "1.0.0"
+}
+components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "library-b"
+ name: "library-b"
+ version: "1.0.0"
+}
+components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "library-c"
+ name: "library-c"
+ version: "1.0.0"
+}
+dependencies {
+ ref: "library-a"
+}
+dependencies {
+ ref: "library-b"
+ dependencies {
+ ref: "library-c"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-dependency-1.6.xml b/tools/src/test/resources/1.7/valid-dependency-1.6.xml
new file mode 100644
index 00000000..7fab8347
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-dependency-1.6.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library" bom-ref="library-a">
+ <name>library-a</name>
+ <version>1.0.0</version>
+ </component>
+ <component type="library" bom-ref="library-b">
+ <name>library-b</name>
+ <version>1.0.0</version>
+ </component>
+ <component type="library" bom-ref="library-c">
+ <name>library-c</name>
+ <version>1.0.0</version>
+ </component>
+ </components>
+ <dependencies>
+ <dependency ref="library-a"/>
+ <dependency ref="library-b">
+ <dependency ref="library-c"/>
+ </dependency>
+ </dependencies>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-empty-components-1.6.json b/tools/src/test/resources/1.7/valid-empty-components-1.6.json
new file mode 100644
index 00000000..a634de3f
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-empty-components-1.6.json
@@ -0,0 +1,9 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-empty-components-1.6.textproto b/tools/src/test/resources/1.7/valid-empty-components-1.6.textproto
new file mode 100644
index 00000000..b40b7c6d
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-empty-components-1.6.textproto
@@ -0,0 +1,6 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
diff --git a/tools/src/test/resources/1.7/valid-empty-components-1.6.xml b/tools/src/test/resources/1.7/valid-empty-components-1.6.xml
new file mode 100644
index 00000000..58f7c849
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-empty-components-1.6.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-evidence-1.6.json b/tools/src/test/resources/1.7/valid-evidence-1.6.json
new file mode 100644
index 00000000..9bb4ebc3
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-evidence-1.6.json
@@ -0,0 +1,158 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "application",
+ "group": "com.google.code.findbugs",
+ "name": "findbugs-project",
+ "version": "3.0.0",
+ "licenses": [
+ {
+ "license": {
+ "id": "LGPL-3.0-or-later",
+ "url": "https://www.gnu.org/licenses/lgpl-3.0-standalone.html"
+ }
+ }
+ ],
+ "purl": "pkg:maven/com.google.code.findbugs/findbugs-project@3.0.0",
+ "evidence": {
+ "identity": {
+ "field": "purl",
+ "confidence": 1,
+ "methods": [
+ {
+ "technique": "filename",
+ "confidence": 0.1,
+ "value": "findbugs-project-3.0.0.jar"
+ },
+ {
+ "technique": "ast-fingerprint",
+ "confidence": 0.9,
+ "value": "61e4bc08251761c3a73b606b9110a65899cb7d44f3b14c81ebc1e67c98e1d9ab"
+ },
+ {
+ "technique": "hash-comparison",
+ "confidence": 0.7,
+ "value": "7c547a9d67cc7bc315c93b6e2ff8e4b6b41ae5be454ac249655ecb5ca2a85abf"
+ }
+ ],
+ "tools": [
+ "bom-ref-of-tool-that-performed-analysis"
+ ]
+ },
+ "occurrences": [
+ {
+ "bom-ref": "d6bf237e-4e11-4713-9f62-56d18d5e2079",
+ "location": "/path/to/component"
+ },
+ {
+ "bom-ref": "b574d5d1-e3cf-4dcd-9ba5-f3507eb1b175",
+ "location": "/another/path/to/component"
+ }
+ ],
+ "callstack": {
+ "frames": [
+ {
+
+ "package": "com.apache.logging.log4j.core",
+ "module": "Logger.class",
+ "function": "logMessage",
+ "parameters": [
+ "com.acme.HelloWorld", "Level.INFO", "null", "Hello World"
+ ],
+ "line": 150,
+ "column": 17,
+ "fullFilename": "/path/to/log4j-core-2.14.0.jar!/org/apache/logging/log4j/core/Logger.class"
+ },
+ {
+ "module": "HelloWorld.class",
+ "function": "main",
+ "line": 20,
+ "column": 12,
+ "fullFilename": "/path/to/HelloWorld.class"
+ }
+ ]
+ },
+ "licenses": [
+ {
+ "license": {
+ "id": "Apache-2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0"
+ }
+ },
+ {
+ "license": {
+ "id": "LGPL-2.1-only",
+ "url": "https://opensource.org/licenses/LGPL-2.1"
+ }
+ }
+ ],
+ "copyright": [
+ {
+ "text": "Copyright 2012 Google Inc. All Rights Reserved."
+ },
+ {
+ "text": "Copyright (C) 2004,2005 Dave Brosius <dbrosius@users.sourceforge.net>"
+ },
+ {
+ "text": "Copyright (C) 2005 William Pugh"
+ },
+ {
+ "text": "Copyright (C) 2004,2005 University of Maryland"
+ }
+ ]
+ }
+ },
+ {
+ "type": "application",
+ "group": "com.example",
+ "name": "example-project",
+ "version": "1.0.0",
+ "purl": "pkg:maven/com.example/example-project@1.0.0",
+ "evidence": {
+ "identity": [
+ {
+ "field": "group",
+ "confidence": 0.1,
+ "concludedValue": "com.example",
+ "methods": [
+ {
+ "technique": "filename",
+ "confidence": 0.1,
+ "value": "example-project-1.0.0.jar"
+ }
+ ]
+ },
+ {
+ "field": "name",
+ "confidence": 0.1,
+ "concludedValue": "example-project",
+ "methods": [
+ {
+ "technique": "filename",
+ "confidence": 0.1,
+ "value": "example-project-1.0.0.jar"
+ }
+ ]
+ },
+ {
+ "field": "version",
+ "confidence": 0.1,
+ "concludedValue": "1.0.0",
+ "methods": [
+ {
+ "technique": "filename",
+ "confidence": 0.1,
+ "value": "example-project-1.0.0.jar"
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-evidence-1.6.textproto b/tools/src/test/resources/1.7/valid-evidence-1.6.textproto
new file mode 100644
index 00000000..e4819eb0
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-evidence-1.6.textproto
@@ -0,0 +1,153 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+# proto-file: bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components [
+ {
+ type: CLASSIFICATION_APPLICATION
+ group: "com.google.code.findbugs"
+ name: "findbugs-project"
+ version: "3.0.0"
+ licenses {
+ license {
+ id: "LGPL-3.0-or-later"
+ url: "https://www.gnu.org/licenses/lgpl-3.0-standalone.html"
+ }
+ }
+ purl: "pkg:maven/com.google.code.findbugs/findbugs-project@3.0.0"
+ evidence {
+ identity: {
+ field: EVIDENCE_FIELD_PURL,
+ confidence: 1,
+ methods: [
+ {
+ technique: EVIDENCE_TECHNIQUE_FILENAME,
+ confidence: 0.1,
+ value: "findbugs-project-3.0.0.jar"
+ },
+ {
+ technique: EVIDENCE_TECHNIQUE_AST_FINGERPRINT
+ confidence: 0.9,
+ value: "61e4bc08251761c3a73b606b9110a65899cb7d44f3b14c81ebc1e67c98e1d9ab"
+ },
+ {
+ technique: EVIDENCE_TECHNIQUE_HASH_COMPARISON
+ confidence: 0.7,
+ value: "7c547a9d67cc7bc315c93b6e2ff8e4b6b41ae5be454ac249655ecb5ca2a85abf"
+ }
+ ],
+ tools: [
+ "bom-ref-of-tool-that-performed-analysis"
+ ]
+ },
+ occurrences: [
+ {
+ bom_ref: "d6bf237e-4e11-4713-9f62-56d18d5e2079"
+ location: "/path/to/component"
+ },
+ {
+ bom_ref: "b574d5d1-e3cf-4dcd-9ba5-f3507eb1b175"
+ location: "/another/path/to/component"
+ }
+ ],
+ callstack: {
+ frames: [
+ {
+ package: "com.apache.logging.log4j.core"
+ module: "Logger.class"
+ function: "logMessage"
+ parameters: [
+ "com.acme.HelloWorld", "Level.INFO", "null", "Hello World"
+ ],
+ line: 150
+ column: 17
+ fullFilename: "/path/to/log4j-core-2.14.0.jar!/org/apache/logging/log4j/core/Logger.class"
+ },
+ {
+ module: "HelloWorld.class"
+ function: "main"
+ line: 20
+ column: 12
+ fullFilename: "/path/to/HelloWorld.class"
+ }
+ ]
+ },
+ licenses {
+ license {
+ id: "Apache-2.0"
+ url: "http://www.apache.org/licenses/LICENSE-2.0"
+ }
+ }
+ licenses {
+ license {
+ id: "LGPL-2.1-only"
+ url: "https://opensource.org/licenses/LGPL-2.1"
+ }
+ }
+ copyright {
+ text: "Copyright 2012 Google Inc. All Rights Reserved."
+ }
+ copyright {
+ text: "Copyright (C) 2004,2005 Dave Brosius <dbrosius@users.sourceforge.net>"
+ }
+ copyright {
+ text: "Copyright (C) 2005 William Pugh"
+ }
+ copyright {
+ text: "Copyright (C) 2004,2005 University of Maryland"
+ }
+ }
+ },
+ {
+ type: CLASSIFICATION_APPLICATION
+ group: "com.example"
+ name: "example-project"
+ version: "1.0.0"
+ purl: "pkg:maven/com.example/example-project@1.0.0"
+ evidence: {
+ identity: [
+ {
+ field: EVIDENCE_FIELD_GROUP
+ confidence: 0.1
+ methods: [
+ {
+ technique: EVIDENCE_TECHNIQUE_FILENAME
+ confidence: 0.1
+ value: "example-project-1.0.0.jar"
+ }
+ ]
+ concludedValue: "com.example"
+ },
+ {
+ field: EVIDENCE_FIELD_NAME
+ confidence: 0.1
+ methods: [
+ {
+ technique: EVIDENCE_TECHNIQUE_FILENAME
+ confidence: 0.1
+ value: "example-project-1.0.0.jar"
+ }
+ ]
+ concludedValue: "example-project"
+ },
+ {
+ field: EVIDENCE_FIELD_VERSION
+ confidence: 0.1
+ methods: [
+ {
+ technique: EVIDENCE_TECHNIQUE_FILENAME
+ confidence: 0.1
+ value: "example-project-1.0.0.jar"
+ }
+ ]
+ concludedValue: "1.0.0"
+ }
+ ]
+ }
+ }
+]
diff --git a/tools/src/test/resources/1.7/valid-evidence-1.6.xml b/tools/src/test/resources/1.7/valid-evidence-1.6.xml
new file mode 100644
index 00000000..32d96983
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-evidence-1.6.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <group>com.google.code.findbugs</group>
+ <name>findbugs-project</name>
+ <version>3.0.0</version>
+ <licenses>
+ <license>
+ <id>LGPL-3.0-or-later</id>
+ <url>https://www.gnu.org/licenses/lgpl-3.0-standalone.html</url>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.google.code.findbugs/findbugs-project@3.0.0</purl>
+ <evidence>
+ <identity>
+ <field>purl</field>
+ <confidence>1</confidence>
+ <methods>
+ <method>
+ <technique>filename</technique>
+ <confidence>0.1</confidence>
+ <value>findbugs-project-3.0.0.jar</value>
+ </method>
+ <method>
+ <technique>ast-fingerprint</technique>
+ <confidence>0.9</confidence>
+ <value>61e4bc08251761c3a73b606b9110a65899cb7d44f3b14c81ebc1e67c98e1d9ab</value>
+ </method>
+ <method>
+ <technique>hash-comparison</technique>
+ <confidence>0.7</confidence>
+ <value>7c547a9d67cc7bc315c93b6e2ff8e4b6b41ae5be454ac249655ecb5ca2a85abf</value>
+ </method>
+ </methods>
+ <tools>
+ <tool ref="bom-ref-of-tool-that-performed-analysis"/>
+ </tools>
+ </identity>
+ <occurrences>
+ <occurrence bom-ref="d6bf237e-4e11-4713-9f62-56d18d5e2079">
+ <location>/path/to/component</location>
+ </occurrence>
+ <occurrence bom-ref="b574d5d1-e3cf-4dcd-9ba5-f3507eb1b175">
+ <location>/another/path/to/component</location>
+ </occurrence>
+ </occurrences>
+ <callstack>
+ <frames>
+ <frame>
+ <package>com.apache.logging.log4j.core</package>
+ <module>Logger.class</module>
+ <function>logMessage</function>
+ <parameters>
+ <parameter>com.acme.HelloWorld</parameter>
+ <parameter>Level.INFO</parameter>
+ <parameter>null</parameter>
+ <parameter>Hello World</parameter>
+ </parameters>
+ <line>150</line>
+ <column>17</column>
+ <fullFilename>/path/to/log4j-core-2.14.0.jar!/org/apache/logging/log4j/core/Logger.class</fullFilename>
+ </frame>
+ <frame>
+ <module>HelloWorld.class</module>
+ <function>main</function>
+ <line>20</line>
+ <column>12</column>
+ <fullFilename>/path/to/HelloWorld.class</fullFilename>
+ </frame>
+ </frames>
+ </callstack>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ <license>
+ <id>LGPL-2.1-only</id>
+ <url>https://opensource.org/licenses/LGPL-2.1</url>
+ </license>
+ </licenses>
+ <copyright>
+ <text><![CDATA[Copyright 2012 Google Inc. All Rights Reserved.]]></text>
+ <text><![CDATA[Copyright (C) 2004,2005 Dave Brosius <dbrosius@users.sourceforge.net>]]></text>
+ <text><![CDATA[Copyright (C) 2005 William Pugh]]></text>
+ <text><![CDATA[Copyright (C) 2004,2005 University of Maryland]]></text>
+ </copyright>
+ </evidence>
+ </component>
+ <component type="application">
+ <group>com.example</group>
+ <name>example-project</name>
+ <version>1.0.0</version>
+ <purl>pkg:maven/com.example/example-project@1.0.0</purl>
+ <evidence>
+ <identity>
+ <field>group</field>
+ <confidence>0.1</confidence>
+ <concludedValue>com.example</concludedValue>
+ <methods>
+ <method>
+ <technique>filename</technique>
+ <confidence>0.1</confidence>
+ <value>example-project-1.0.0.jar</value>
+ </method>
+ </methods>
+ </identity>
+ <identity>
+ <field>name</field>
+ <confidence>0.1</confidence>
+ <concludedValue>example-project</concludedValue>
+ <methods>
+ <method>
+ <technique>filename</technique>
+ <confidence>0.1</confidence>
+ <value>example-project-1.0.0.jar</value>
+ </method>
+ </methods>
+ </identity>
+ <identity>
+ <field>version</field>
+ <confidence>0.1</confidence>
+ <concludedValue>1.0.0</concludedValue>
+ <methods>
+ <method>
+ <technique>filename</technique>
+ <confidence>0.1</confidence>
+ <value>example-project-1.0.0.jar</value>
+ </method>
+ </methods>
+ </identity>
+ </evidence>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-external-elements-1.6.xml b/tools/src/test/resources/1.7/valid-external-elements-1.6.xml
new file mode 100644
index 00000000..768137a7
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-external-elements-1.6.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ <text content-type="text/plain" encoding="base64">
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.</text>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ <pedigree>
+ <ancestors>
+ <component type="application">
+ <publisher>Apache</publisher>
+ <group>org.apache.tomcat</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Apache Catalina</description>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </license>
+ </licenses>
+ <purl>pkg:maven/org.apache.tomcat/tomcat-catalina@9.0.14?packaging=jar</purl>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </component>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </ancestors>
+ <descendants>
+ <component type="library">
+ <name>foo</name>
+ <version>1.0</version>
+ </component>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </descendants>
+ <variants>
+ <component type="library">
+ <name>bar</name>
+ <version>1.0</version>
+ </component>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </variants>
+ <commits>
+ <commit>
+ <uid>7638417db6d59f3c431d3e1f261cc637155684cd</uid>
+ <url>https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd</url>
+ <author>
+ <timestamp>2018-11-07T22:01:45Z</timestamp>
+ <name>John Doe</name>
+ <email>john.doe@example.com</email>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </author>
+ <committer>
+ <timestamp>2018-11-07T22:01:45Z</timestamp>
+ <name>Jane Doe</name>
+ <email>jane.doe@example.com</email>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </committer>
+ <message>Initial commit</message>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </commit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </commits>
+ <notes>Commentary here</notes>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </pedigree>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </component>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ </components>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+ <foo:fruit xmlns:foo="foo">
+ <foo:name>Banana</foo:name>
+ </foo:fruit>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-external-reference-1.6.json b/tools/src/test/resources/1.7/valid-external-reference-1.6.json
new file mode 100644
index 00000000..f5e24561
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-external-reference-1.6.json
@@ -0,0 +1,218 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "publisher": "Acme Inc",
+ "group": "org.example",
+ "name": "mylibrary",
+ "version": "1.0.0",
+ "externalReferences": [
+ {
+ "type": "advisories",
+ "url": "https://example.org/security/feed/csaf",
+ "comment": "Security advisories from the vendor"
+ },
+ {
+ "type": "bom",
+ "url": "https://example.org/support/sbom/portal-server/1.0.0",
+ "comment": "An external SBOM that describes what this component includes",
+ "hashes": [
+ {
+ "alg": "SHA-256",
+ "content": "708f1f53b41f11f02d12a11b1a38d2905d47b099afc71a0f1124ef8582ec7313"
+ }
+ ]
+ },
+ {
+ "type": "documentation",
+ "url": "https://example.org/support/documentation/portal-server/1.0.0",
+ "comment": "Vendor provided documentation for the product"
+ }
+ ]
+ },
+ {
+ "type": "application",
+ "name": "dummy",
+ "description": "this component has all external reference types possible",
+ "externalReferences": [
+ {
+ "type": "vcs",
+ "url": "http://example.com/extref/vcs"
+ },
+ {
+ "type": "issue-tracker",
+ "url": "http://example.com/extref/issue-tracker"
+ },
+ {
+ "type": "website",
+ "url": "http://example.com/extref/website"
+ },
+ {
+ "type": "advisories",
+ "url": "http://example.com/extref/advisories"
+ },
+ {
+ "type": "bom",
+ "url": "http://example.com/extref/bom"
+ },
+ {
+ "type": "mailing-list",
+ "url": "http://example.com/extref/mailing-list"
+ },
+ {
+ "type": "social",
+ "url": "http://example.com/extref/social"
+ },
+ {
+ "type": "chat",
+ "url": "http://example.com/extref/chat"
+ },
+ {
+ "type": "documentation",
+ "url": "http://example.com/extref/documentation"
+ },
+ {
+ "type": "support",
+ "url": "http://example.com/extref/support"
+ },
+ {
+ "type": "source-distribution",
+ "url": "http://example.com/extref/source-distribution"
+ },
+ {
+ "type": "distribution",
+ "url": "http://example.com/extref/distribution"
+ },
+ {
+ "type": "distribution-intake",
+ "url": "http://example.com/extref/distribution-intake"
+ },
+ {
+ "type": "license",
+ "url": "http://example.com/extref/license"
+ },
+ {
+ "type": "build-meta",
+ "url": "http://example.com/extref/build-meta"
+ },
+ {
+ "type": "build-system",
+ "url": "http://example.com/extref/build-system"
+ },
+ {
+ "type": "release-notes",
+ "url": "http://example.com/extref/release-notes"
+ },
+ {
+ "type": "security-contact",
+ "url": "http://example.com/extref/security-contact"
+ },
+ {
+ "type": "model-card",
+ "url": "http://example.com/extref/model-card"
+ },
+ {
+ "type": "log",
+ "url": "http://example.com/extref/log"
+ },
+ {
+ "type": "configuration",
+ "url": "http://example.com/extref/configuration"
+ },
+ {
+ "type": "evidence",
+ "url": "http://example.com/extref/evidence"
+ },
+ {
+ "type": "formulation",
+ "url": "http://example.com/extref/formulation"
+ },
+ {
+ "type": "attestation",
+ "url": "http://example.com/extref/attestation"
+ },
+ {
+ "type": "threat-model",
+ "url": "http://example.com/extref/threat-model"
+ },
+ {
+ "type": "adversary-model",
+ "url": "http://example.com/extref/adversary-model"
+ },
+ {
+ "type": "risk-assessment",
+ "url": "http://example.com/extref/risk-assessment"
+ },
+ {
+ "type": "vulnerability-assertion",
+ "url": "http://example.com/extref/vulnerability-assertion"
+ },
+ {
+ "type": "exploitability-statement",
+ "url": "http://example.com/extref/exploitability-statement"
+ },
+ {
+ "type": "pentest-report",
+ "url": "http://example.com/extref/pentest-report"
+ },
+ {
+ "type": "static-analysis-report",
+ "url": "http://example.com/extref/static-analysis-report"
+ },
+ {
+ "type": "dynamic-analysis-report",
+ "url": "http://example.com/extref/dynamic-analysis-report"
+ },
+ {
+ "type": "runtime-analysis-report",
+ "url": "http://example.com/extref/runtime-analysis-report"
+ },
+ {
+ "type": "component-analysis-report",
+ "url": "http://example.com/extref/component-analysis-report"
+ },
+ {
+ "type": "maturity-report",
+ "url": "http://example.com/extref/maturity-report"
+ },
+ {
+ "type": "certification-report",
+ "url": "http://example.com/extref/certification-report"
+ },
+ {
+ "type": "quality-metrics",
+ "url": "http://example.com/extref/quality-metrics"
+ },
+ {
+ "type": "codified-infrastructure",
+ "url": "http://example.com/extref/codified-infrastructure"
+ },
+ {
+ "type": "poam",
+ "url": "http://example.com/extref/poam"
+ },
+ {
+ "type": "electronic-signature",
+ "url": "http://example.com/extref/electronic-signature"
+ },
+ {
+ "type": "digital-signature",
+ "url": "http://example.com/extref/digital-signature"
+ },
+ {
+ "type": "rfc-9116",
+ "url": "http://example.com/extref/rfc-9116"
+ },
+ {
+ "type": "other",
+ "url": "http://example.com/extref/other"
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-external-reference-1.6.textproto b/tools/src/test/resources/1.7/valid-external-reference-1.6.textproto
new file mode 100644
index 00000000..9a8c3df2
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-external-reference-1.6.textproto
@@ -0,0 +1,209 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ publisher: "Acme Inc"
+ group: "org.example"
+ name: "mylibrary"
+ version: "1.0.0"
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_ADVISORIES
+ url: "https://example.org/security/feed/csaf"
+ comment: "Security advisories from the vendor"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_BOM
+ url: "https://example.org/support/sbom/portal-server/1.0.0"
+ comment: "An external SBOM that describes what this component includes"
+ hashes {
+ alg: HASH_ALG_SHA_256
+ value: "708f1f53b41f11f02d12a11b1a38d2905d47b099afc71a0f1124ef8582ec7313"
+ }
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DOCUMENTATION
+ url: "https://example.org/support/documentation/portal-server/1.0.0"
+ comment: "Vendor provided documentation for the product"
+ }
+}
+components {
+ type: CLASSIFICATION_APPLICATION
+ name: "dummy"
+ description: "this component has all external reference types possible"
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_VCS
+ url: "http://example.com/extref/vcs"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_ISSUE_TRACKER
+ url: "http://example.com/extref/issue-tracker"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_WEBSITE
+ url: "http://example.com/extref/website"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_ADVISORIES
+ url: "http://example.com/extref/advisories"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_BOM
+ url: "http://example.com/extref/bom"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_MAILING_LIST
+ url: "http://example.com/extref/mailing-list"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_SOCIAL
+ url: "http://example.com/extref/social"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_CHAT
+ url: "http://example.com/extref/chat"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DOCUMENTATION
+ url: "http://example.com/extref/documentation"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_SUPPORT
+ url: "http://example.com/extref/support"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_SOURCE_DISTRIBUTION
+ url: "http://example.com/extref/source-distribution"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DISTRIBUTION
+ url: "http://example.com/extref/distribution"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DISTRIBUTION_INTAKE
+ url: "http://example.com/extref/distribution-intake"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_LICENSE
+ url: "http://example.com/extref/license"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_BUILD_META
+ url: "http://example.com/extref/build-meta"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_BUILD_SYSTEM
+ url: "http://example.com/extref/build-system"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_RELEASE_NOTES
+ url: "http://example.com/extref/release-notes"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_SECURITY_CONTACT
+ url: "http://example.com/extref/security-contact"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_MODEL_CARD
+ url: "http://example.com/extref/model-card"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_LOG
+ url: "http://example.com/extref/log"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_CONFIGURATION
+ url: "http://example.com/extref/configuration"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_EVIDENCE
+ url: "http://example.com/extref/evidence"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_FORMULATION
+ url: "http://example.com/extref/formulation"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_ATTESTATION
+ url: "http://example.com/extref/attestation"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_THREAT_MODEL
+ url: "http://example.com/extref/threat-model"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_ADVERSARY_MODEL
+ url: "http://example.com/extref/adversary-model"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_RISK_ASSESSMENT
+ url: "http://example.com/extref/risk-assessment"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_VULNERABILITY_ASSERTION
+ url: "http://example.com/extref/vulnerability-assertion"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_EXPLOITABILITY_STATEMENT
+ url: "http://example.com/extref/exploitability-statement"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_PENTEST_REPORT
+ url: "http://example.com/extref/pentest-report"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_STATIC_ANALYSIS_REPORT
+ url: "http://example.com/extref/static-analysis-report"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DYNAMIC_ANALYSIS_REPORT
+ url: "http://example.com/extref/dynamic-analysis-report"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_RUNTIME_ANALYSIS_REPORT
+ url: "http://example.com/extref/runtime-analysis-report"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_COMPONENT_ANALYSIS_REPORT
+ url: "http://example.com/extref/component-analysis-report"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_MATURITY_REPORT
+ url: "http://example.com/extref/maturity-report"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_CERTIFICATION_REPORT
+ url: "http://example.com/extref/certification-report"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_QUALITY_METRICS
+ url: "http://example.com/extref/quality-metrics"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_CODIFIED_INFRASTRUCTURE
+ url: "http://example.com/extref/codified-infrastructure"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_POAM
+ url: "http://example.com/extref/poam"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_ELECTRONIC_SIGNATURE
+ url: "http://example.com/extref/electronic-signature"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DIGITAL_SIGNATURE
+ url: "http://example.com/extref/digital-signature"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_RFC_9116
+ url: "http://example.com/extref/rfc-9116"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_OTHER
+ url: "http://example.com/extref/other"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-external-reference-1.6.xml b/tools/src/test/resources/1.7/valid-external-reference-1.6.xml
new file mode 100644
index 00000000..95cffa0d
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-external-reference-1.6.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <publisher>Acme Inc</publisher>
+ <group>org.example</group>
+ <name>mylibrary</name>
+ <version>1.0.0</version>
+ <externalReferences>
+ <reference type="advisories">
+ <url>https://example.org/security/feed/csaf</url>
+ <comment>Security advisories from the vendor</comment>
+ </reference>
+ <reference type="bom">
+ <url>https://example.org/support/sbom/portal-server/1.0.0</url>
+ <comment>An external SBOM that describes what this component includes</comment>
+ <hashes>
+ <hash alg="SHA-256">708f1f53b41f11f02d12a11b1a38d2905d47b099afc71a0f1124ef8582ec7313</hash>
+ </hashes>
+ </reference>
+ <reference type="documentation">
+ <url>https://example.org/support/documentation/portal-server/1.0.0</url>
+ <comment>Vendor provided documentation for the product</comment>
+ </reference>
+ </externalReferences>
+ </component>
+ <component type="application">
+ <name>dummy</name>
+ <description>this component has all external reference types possible</description>
+ <externalReferences>
+ <reference type="vcs"><url>http://example.com/extref/vcs</url></reference>
+ <reference type="issue-tracker"><url>http://example.com/extref/issue-tracker</url></reference>
+ <reference type="website"><url>http://example.com/extref/website</url></reference>
+ <reference type="advisories"><url>http://example.com/extref/advisories</url></reference>
+ <reference type="bom"><url>http://example.com/extref/bom</url></reference>
+ <reference type="mailing-list"><url>http://example.com/extref/mailing-list</url></reference>
+ <reference type="social"><url>http://example.com/extref/social</url></reference>
+ <reference type="chat"><url>http://example.com/extref/chat</url></reference>
+ <reference type="documentation"><url>http://example.com/extref/documentation</url></reference>
+ <reference type="support"><url>http://example.com/extref/support</url></reference>
+ <reference type="source-distribution"><url>http://example.com/extref/source-distribution</url></reference>
+ <reference type="distribution"><url>http://example.com/extref/distribution</url></reference>
+ <reference type="distribution-intake"><url>http://example.com/extref/distribution-intake</url></reference>
+ <reference type="license"><url>http://example.com/extref/license</url></reference>
+ <reference type="build-meta"><url>http://example.com/extref/build-meta</url></reference>
+ <reference type="build-system"><url>http://example.com/extref/build-system</url></reference>
+ <reference type="release-notes"><url>http://example.com/extref/release-notes</url></reference>
+ <reference type="security-contact"><url>http://example.com/extref/security-contact</url></reference>
+ <reference type="model-card"><url>http://example.com/extref/model-card</url></reference>
+ <reference type="log"><url>http://example.com/extref/log</url></reference>
+ <reference type="configuration"><url>http://example.com/extref/configuration</url></reference>
+ <reference type="evidence"><url>http://example.com/extref/evidence</url></reference>
+ <reference type="formulation"><url>http://example.com/extref/formulation</url></reference>
+ <reference type="attestation"><url>http://example.com/extref/attestation</url></reference>
+ <reference type="threat-model"><url>http://example.com/extref/threat-model</url></reference>
+ <reference type="adversary-model"><url>http://example.com/extref/adversary-model</url></reference>
+ <reference type="risk-assessment"><url>http://example.com/extref/risk-assessment</url></reference>
+ <reference type="vulnerability-assertion"><url>http://example.com/extref/vulnerability-assertion</url></reference>
+ <reference type="exploitability-statement"><url>http://example.com/extref/exploitability-statement</url></reference>
+ <reference type="pentest-report"><url>http://example.com/extref/pentest-report</url></reference>
+ <reference type="static-analysis-report"><url>http://example.com/extref/static-analysis-report</url></reference>
+ <reference type="dynamic-analysis-report"><url>http://example.com/extref/dynamic-analysis-report</url></reference>
+ <reference type="runtime-analysis-report"><url>http://example.com/extref/runtime-analysis-report</url></reference>
+ <reference type="component-analysis-report"><url>http://example.com/extref/component-analysis-report</url></reference>
+ <reference type="maturity-report"><url>http://example.com/extref/maturity-report</url></reference>
+ <reference type="certification-report"><url>http://example.com/extref/certification-report</url></reference>
+ <reference type="quality-metrics"><url>http://example.com/extref/quality-metrics</url></reference>
+ <reference type="codified-infrastructure"><url>http://example.com/extref/codified-infrastructure</url></reference>
+ <reference type="poam"><url>http://example.com/extref/poam</url></reference>
+ <reference type="electronic-signature"><url>http://example.com/extref/electronic-signature</url></reference>
+ <reference type="digital-signature"><url>http://example.com/extref/digital-signature</url></reference>
+ <reference type="rfc-9116"><url>http://example.com/extref/rfc-9116</url></reference>
+ <reference type="other"><url>http://example.com/extref/other</url></reference>
+ </externalReferences>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-formulation-1.6.json b/tools/src/test/resources/1.7/valid-formulation-1.6.json
new file mode 100644
index 00000000..ce49ece6
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-formulation-1.6.json
@@ -0,0 +1,295 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "publisher": "Acme Inc",
+ "group": "org.example",
+ "name": "mylibrary",
+ "version": "1.0.0"
+ }
+ ],
+ "formulation": [
+ {
+ "bom-ref": "formula-1",
+ "components": [
+ {
+ "bom-ref": "component-1",
+ "type": "platform",
+ "name": "Pipeline controller image",
+ "version": "v0.47.0"
+ }
+ ],
+ "workflows": [
+ {
+ "bom-ref": "workflow-1",
+ "uid": "8edb2b08-e2c7-11ed-b5ea-0242ac120002",
+ "name": "My workflow",
+ "description": "Workflow description here",
+ "resourceReferences": [
+ {
+ "ref": "component-a"
+ }
+ ],
+ "tasks": [
+ {
+ "bom-ref": "task-1",
+ "uid": "task-uid-1",
+ "name": "fetch-repository",
+ "description": "Description here",
+ "resourceReferences": [
+ {
+ "ref": "component-a"
+ }
+ ],
+ "taskTypes": [ "clone", "build" ],
+ "trigger": {
+ "bom-ref": "trigger-1",
+ "uid": "trigger-1",
+ "type": "api"
+ },
+ "steps": [
+ {
+ "name": "My step"
+ }
+ ],
+ "inputs": [
+ {
+ "resource": {
+ "ref": "component-a"
+ }
+ }
+ ],
+ "outputs": [
+ {
+ "resource": {
+ "ref": "component-b"
+ }
+ }
+ ],
+ "timeStart": "2023-01-01T00:00:00+00:00",
+ "timeEnd": "2023-01-01T00:00:00+00:00",
+ "workspaces": [
+ {
+ "bom-ref": "workspace-1",
+ "uid": "workspace-uid-1",
+ "name": "workspace"
+ }
+ ],
+ "runtimeTopology": [
+ {
+ "ref": "task-1",
+ "dependsOn": [ "task-2" ]
+ }
+ ]
+ }
+ ],
+ "taskDependencies": [
+ {
+ "ref": "task-1",
+ "dependsOn": ["task-2"]
+ }
+ ],
+ "taskTypes": [ "clone", "build" ],
+ "trigger": {
+ "bom-ref": "trigger-2",
+ "uid": "trigger-uid-2",
+ "name": "My trigger",
+ "description": "Description here",
+ "resourceReferences": [
+ {
+ "ref": "component-a"
+ }
+ ],
+ "type": "api",
+ "event": {
+ "uid": "event-1",
+ "description": "Description here",
+ "timeReceived": "2023-01-01T00:00:00+00:00",
+ "data": {
+ "contentType": "text/plain",
+ "content": "Foo/Bar"
+ },
+ "source": {
+ "ref": "component-g"
+ },
+ "target": {
+ "ref": "component-h"
+ },
+ "properties": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ }
+ ]
+ },
+ "conditions": [
+ {
+ "description": "Description here",
+ "expression": "1 == 1",
+ "properties": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ }
+ ]
+ }
+ ],
+ "timeActivated": "2023-01-01T00:00:00+00:00",
+ "inputs": [
+ {
+ "resource": {
+ "ref": "component-10"
+ },
+ "source": {
+ "ref": "component-11"
+ },
+ "target": {
+ "ref": "component-12"
+ }
+ }
+ ],
+ "outputs": [
+ {
+ "resource": {
+ "ref": "component-14"
+ },
+ "type": "artifact",
+ "source": {
+ "ref": "component-15"
+ },
+ "target": {
+ "ref": "component-16"
+ }
+ }
+ ],
+ "properties": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ }
+ ]
+ },
+ "steps": [
+ {
+ "name": "My step",
+ "description": "Description here",
+ "commands": [
+ {
+ "executed": "ls -las",
+ "properties": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ }
+ ]
+ }
+ ],
+ "properties": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ }
+ ]
+ }
+ ],
+ "inputs": [
+ {
+ "environmentVars": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ }
+ ]
+ },
+ {
+ "environmentVars": [
+ "FooBar"
+ ]
+ },
+ {
+ "environmentVars": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ },
+ "FooBar"
+ ]
+ }
+ ],
+ "outputs": [
+ {
+ "environmentVars": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ }
+ ]
+ },
+ {
+ "environmentVars": [
+ "FooBar"
+ ]
+ },
+ {
+ "environmentVars": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ },
+ "FooBar"
+ ]
+ }
+ ],
+ "timeStart": "2023-01-01T00:00:00+00:00",
+ "timeEnd": "2023-01-01T00:00:10+00:00",
+ "workspaces": [
+ {
+ "bom-ref": "workspace-2",
+ "uid": "workspace-1",
+ "name": "My workspace",
+ "aliases": [ "default-workspace" ],
+ "description": "Description here",
+ "resourceReferences": [
+ {
+ "ref": "component-t"
+ }
+ ],
+ "accessMode": "read-write",
+ "mountPath": "/tmp/workspace",
+ "managedDataType": "ConfigMap",
+ "volumeRequest": "requestedVolumeClaim",
+ "volume": {
+ "uid": "volume-1",
+ "name": "My volume",
+ "mode": "filesystem",
+ "path": "/",
+ "sizeAllocated": "10GB",
+ "persistent": true,
+ "remote": false
+ }
+ }
+ ],
+ "runtimeTopology": [
+ {
+ "ref": "component-s",
+ "dependsOn": [
+ "component-r"
+ ]
+ }
+ ],
+ "properties": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-formulation-1.6.textproto b/tools/src/test/resources/1.7/valid-formulation-1.6.textproto
new file mode 100644
index 00000000..7d71e341
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-formulation-1.6.textproto
@@ -0,0 +1,338 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ publisher: "Acme Inc"
+ group: "org.example"
+ name: "mylibrary",
+ version: "1.0.0"
+}
+formulation: [
+ {
+ bom_ref: "formula-1"
+ components: [
+ {
+ bom_ref: "component-1"
+ type: CLASSIFICATION_PLATFORM
+ name: "Pipeline controller image"
+ version: "v0.47.0"
+ }
+ ]
+ workflows: [
+ {
+ bom_ref: "workflow-1"
+ uid: "8edb2b08-e2c7-11ed-b5ea-0242ac120002"
+ name: "My workflow"
+ description: "Workflow description here"
+ resourceReferences: [
+ {
+ ref: "component-a"
+ }
+ ]
+ tasks: [
+ {
+ bom_ref: "task-1"
+ uid: "task-uid-1"
+ name: "fetch-repository"
+ description: "Description here"
+ resourceReferences: [
+ {
+ ref: "component-a"
+ }
+ ]
+ taskTypes: [
+ TASK_TYPE_CLONE, TASK_TYPE_BUILD
+ ]
+ trigger {
+ bom_ref: "trigger-1"
+ uid: "trigger-1"
+ type: TRIGGER_TYPE_API
+ }
+ steps: [
+ {
+ name: "My step"
+ }
+ ]
+ inputs: [
+ {
+ resource: {
+ ref: "component-a"
+ }
+ }
+ ]
+ outputs: [
+ {
+ resource: {
+ ref: "component-b"
+ }
+ }
+ ]
+ timeStart {
+ seconds: 1672531200
+ nanos: 0
+ }
+ timeEnd {
+ seconds: 1672531200
+ nanos: 0
+ }
+ workspaces: [
+ {
+ bom_ref: "workspace-1"
+ uid: "workspace-uid-1"
+ name: "workspace"
+ }
+ ]
+ runtimeTopology: [
+ {
+ ref: "task-1"
+ dependencies: [
+ {
+ ref: "task-2"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ taskDependencies: [
+ {
+ ref: "task-1"
+ dependencies: [
+ {
+ ref: "task-2"
+ }
+ ]
+ }
+ ]
+ taskTypes: [ TASK_TYPE_CLONE, TASK_TYPE_BUILD ]
+ trigger: {
+ bom_ref: "trigger-2"
+ uid: "trigger-uid-2"
+ name: "My trigger"
+ description: "Description here"
+ resourceReferences: [
+ {
+ ref: "component-a"
+ }
+ ]
+ type: TRIGGER_TYPE_API
+ event: {
+ uid: "event-1"
+ description: "Description here"
+ timeReceived {
+ seconds: 1672531200
+ nanos: 0
+ }
+ data: {
+ content_type: "text/plain"
+ value: "Foo/Bar"
+ }
+ source: {
+ ref: "component-g"
+ }
+ target: {
+ ref: "component-h"
+ }
+ properties: [
+ {
+ name: "Foo"
+ value: "Bar"
+ }
+ ]
+ }
+ conditions: [
+ {
+ description: "Description here"
+ expression: "1 == 1"
+ properties: [
+ {
+ name: "Foo"
+ value: "Bar"
+ }
+ ]
+ }
+ ]
+ timeActivated {
+ seconds: 1672531200
+ nanos: 0
+ }
+ inputs: [
+ {
+ resource: {
+ ref: "component-10"
+ }
+ source: {
+ ref: "component-11"
+ }
+ target: {
+ ref: "component-12"
+ }
+ }
+ ]
+ outputs: [
+ {
+ resource: {
+ ref: "component-14"
+ }
+ type: OUTPUT_TYPE_ARTIFACT
+ source: {
+ ref: "component-15"
+ }
+ target: {
+ ref: "component-16"
+ }
+ }
+ ]
+ properties: [
+ {
+ name: "Foo"
+ value: "Bar"
+ }
+ ]
+ }
+ steps: [
+ {
+ name: "My step"
+ description: "Description here"
+ commands: [
+ {
+ executed: "ls -las"
+ properties: [
+ {
+ name: "Foo"
+ value: "Bar"
+ }
+ ]
+ }
+ ]
+ properties: [
+ {
+ name: "Foo"
+ value: "Bar"
+ }
+ ]
+ }
+ ]
+ inputs: [
+ {
+ environmentVars: [
+ {
+ property: {
+ name: "Foo"
+ value: "Bar"
+ }
+ }
+ ]
+ },
+ {
+ environmentVars: [
+ {
+ value: "FooBar"
+ }
+ ]
+ },
+ {
+ environmentVars: [
+ {
+ property: {
+ name: "Foo"
+ value: "Bar"
+ }
+ },
+ {
+ value: "FooBar"
+ }
+ ]
+ }
+ ]
+ outputs: [
+ {
+ environmentVars: [
+ {
+ property: {
+ name: "Foo"
+ value: "Bar"
+ }
+ }
+ ]
+ },
+ {
+ environmentVars: [
+ {
+ value: "FooBar"
+ }
+ ]
+ },
+ {
+ environmentVars: [
+ {
+ property: {
+ name: "Foo"
+ value: "Bar"
+ }
+ },
+ {
+ value: "FooBar"
+ }
+ ]
+ }
+ ]
+ timeStart {
+ seconds: 1672531200
+ nanos: 0
+ }
+ timeEnd {
+ seconds: 1672531210
+ nanos: 0
+ }
+ workspaces: [
+ {
+ bom_ref: "workspace-2"
+ uid: "workspace-1"
+ name: "My workspace"
+ aliases: [ "default-workspace" ]
+ description: "Description here"
+ resourceReferences: [
+ {
+ ref: "component-t"
+ }
+ ]
+ accessMode: ACCESS_MODE_READ_WRITE
+ mountPath: "/tmp/workspace"
+ managedDataType: "ConfigMap"
+ volumeRequest: "requestedVolumeClaim"
+ volume: {
+ uid: "volume-1"
+ name: "My volume"
+ mode: VOLUME_MODE_FILESYSTEM
+ path: "/"
+ sizeAllocated: "10GB"
+ persistent: true
+ remote: false
+ }
+ }
+ ]
+ runtimeTopology: [
+ {
+ ref: "component-s"
+ dependencies: [
+ {
+ ref: "component-r"
+ }
+ ]
+ }
+ ]
+ properties: [
+ {
+ name: "Foo"
+ value: "Bar"
+ }
+ ]
+ }
+ ]
+ }
+]
diff --git a/tools/src/test/resources/1.7/valid-formulation-1.6.xml b/tools/src/test/resources/1.7/valid-formulation-1.6.xml
new file mode 100644
index 00000000..38441825
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-formulation-1.6.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <publisher>Acme Inc</publisher>
+ <group>org.example</group>
+ <name>mylibrary</name>
+ <version>1.0.0</version>
+ </component>
+ </components>
+ <formulation>
+ <formula bom-ref="formula-1">
+ <components>
+ <component type="platform" bom-ref="component-1">
+ <name>Pipeline controller image</name>
+ <version>v0.47.0</version>
+ </component>
+ </components>
+ <workflows>
+ <workflow bom-ref="workflow-1">
+ <uid>8edb2b08-e2c7-11ed-b5ea-0242ac120002</uid>
+ <name>My workflow</name>
+ <description>Workflow description here</description>
+ <resourceReferences>
+ <resourceReference>
+ <ref>component-a</ref>
+ </resourceReference>
+ </resourceReferences>
+ <tasks>
+ <task bom-ref="task-1">
+ <uid>task-uid-1</uid>
+ <name>fetch-repository</name>
+ <description>Description here</description>
+ <resourceReferences>
+ <resourceReference>
+ <ref>component-a</ref>
+ </resourceReference>
+ </resourceReferences>
+ <taskTypes>
+ <taskType>clone</taskType>
+ <taskType>build</taskType>
+ </taskTypes>
+ <trigger bom-ref="trigger-1">
+ <uid>trigger-1</uid>
+ <type>api</type>
+ </trigger>
+ <steps>
+ <step>
+ <name>My step</name>
+ </step>
+ </steps>
+ <inputs>
+ <input>
+ <resource>
+ <ref>component-a</ref>
+ </resource>
+ </input>
+ </inputs>
+ <outputs>
+ <output>
+ <resource>
+ <ref>component-b</ref>
+ </resource>
+ </output>
+ </outputs>
+ <timeStart>2023-01-01T00:00:00+00:00</timeStart>
+ <timeEnd>2023-01-01T00:00:00+00:00</timeEnd>
+ <workspaces>
+ <workspace bom-ref="workspace-1">
+ <uid>workspace-uid-1</uid>
+ <name>workspace</name>
+ </workspace>
+ </workspaces>
+ <runtimeTopology>
+ <dependency ref="task-1">
+ <dependency ref="task-2" />
+ </dependency>
+ </runtimeTopology>
+ </task>
+ </tasks>
+ <taskDependencies>
+ <dependency ref="task-1">
+ <dependency ref="task-2" />
+ </dependency>
+ </taskDependencies>
+ <taskTypes>
+ <taskType>clone</taskType>
+ <taskType>build</taskType>
+ </taskTypes>
+ <trigger bom-ref="trigger-2">
+ <uid>trigger-uid-2</uid>
+ <name>My trigger</name>
+ <description>Description here</description>
+ <resourceReferences>
+ <resourceReference>
+ <ref>component-a</ref>
+ </resourceReference>
+ </resourceReferences>
+ <type>api</type>
+ <event>
+ <uid>event-1</uid>
+ <description>Description here</description>
+ <timeReceived>2023-01-01T00:00:00+00:00</timeReceived>
+ <data>Foo/Bar</data>
+ <source>
+ <ref>component-g</ref>
+ </source>
+ <target>
+ <ref>component-h</ref>
+ </target>
+ <properties>
+ <property name="Foo">Bar</property>
+ </properties>
+ </event>
+ <conditions>
+ <condition>
+ <description>Description here</description>
+ <expression>1 == 1</expression>
+ <properties>
+ <property name="Foo">Bar</property>
+ </properties>
+ </condition>
+ </conditions>
+ <timeActivated>2023-01-01T00:00:00+00:00</timeActivated>
+ <inputs>
+ <input>
+ <resource>
+ <ref>component-10</ref>
+ </resource>
+ <source>
+ <ref>component-11</ref>
+ </source>
+ <target>
+ <ref>component-12</ref>
+ </target>
+ </input>
+ </inputs>
+ <outputs>
+ <output>
+ <resource>
+ <ref>component-14</ref>
+ </resource>
+ <type>artifact</type>
+ <source>
+ <ref>component-15</ref>
+ </source>
+ <target>
+ <ref>component-16</ref>
+ </target>
+ </output>
+ </outputs>
+ <properties>
+ <property name="Foo">Bar</property>
+ </properties>
+ </trigger>
+ <steps>
+ <step>
+ <name>My step</name>
+ <description>Description here</description>
+ <commands>
+ <command>
+ <executed>ls -las</executed>
+ <properties>
+ <property name="Foo">Bar</property>
+ </properties>
+ </command>
+ </commands>
+ <properties>
+ <property name="Foo">Bar</property>
+ </properties>
+ </step>
+ </steps>
+ <inputs>
+ <input>
+ <environmentVars>
+ <environmentVar name="Foo">Bar</environmentVar>
+ </environmentVars>
+ </input>
+ <input>
+ <environmentVars>
+ <value>FooBar</value>
+ </environmentVars>
+ </input>
+ <input>
+ <environmentVars>
+ <environmentVar name="Foo">Bar</environmentVar>
+ <value>FooBar</value>
+ </environmentVars>
+ </input>
+ </inputs>
+ <outputs>
+ <output>
+ <environmentVars>
+ <environmentVar name="Foo">Bar</environmentVar>
+ </environmentVars>
+ </output>
+ <output>
+ <environmentVars>
+ <value>FooBar</value>
+ </environmentVars>
+ </output>
+ <output>
+ <environmentVars>
+ <environmentVar name="Foo">Bar</environmentVar>
+ <value>FooBar</value>
+ </environmentVars>
+ </output>
+ </outputs>
+ <timeStart>2023-01-01T00:00:00+00:00</timeStart>
+ <timeEnd>2023-01-01T00:00:10+00:00</timeEnd>
+ <workspaces>
+ <workspace bom-ref="workspace-2">
+ <uid>workspace-1</uid>
+ <name>My workspace</name>
+ <aliases>
+ <alias>default-workspace</alias>
+ </aliases>
+ <description>Description here</description>
+ <resourceReferences>
+ <resourceReference>
+ <ref>component-t</ref>
+ </resourceReference>
+ </resourceReferences>
+ <accessMode>read-write</accessMode>
+ <mountPath>/tmp/workspace</mountPath>
+ <managedDataType>ConfigMap</managedDataType>
+ <volumeRequest>requestedVolumeClaim</volumeRequest>
+ <volume>
+ <uid>volume-1</uid>
+ <name>My volume</name>
+ <mode>filesystem</mode>
+ <path>/</path>
+ <sizeAllocated>10GB</sizeAllocated>
+ <persistent>true</persistent>
+ <remote>false</remote>
+ </volume>
+ </workspace>
+ </workspaces>
+ <runtimeTopology>
+ <dependency ref="component-s">
+ <dependency ref="component-r"/>
+ </dependency>
+ </runtimeTopology>
+ <properties>
+ <property name="Foo">Bar</property>
+ </properties>
+ </workflow>
+ </workflows>
+ </formula>
+ </formulation>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.6.json b/tools/src/test/resources/1.7/valid-license-expression-1.6.json
new file mode 100644
index 00000000..dd4f6b99
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-expression-1.6.json
@@ -0,0 +1,44 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "application",
+ "publisher": "Acme Inc",
+ "group": "com.acme",
+ "name": "tomcat-catalina",
+ "version": "9.0.14",
+ "description": "Modified version of Apache Catalina",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "MD5",
+ "content": "3942447fac867ae5cdb3229b658f4d48"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ ],
+ "licenses": [
+ {
+ "expression": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
+ "acknowledgement": "declared",
+ "bom-ref": "my-license"
+ }
+ ],
+ "purl": "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.6.textproto b/tools/src/test/resources/1.7/valid-license-expression-1.6.textproto
new file mode 100644
index 00000000..6666405f
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-expression-1.6.textproto
@@ -0,0 +1,37 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_APPLICATION
+ publisher: "Acme Inc"
+ group: "com.acme"
+ name: "tomcat-catalina"
+ version: "9.0.14"
+ description: "Modified version of Apache Catalina"
+ scope: SCOPE_REQUIRED
+ hashes {
+ alg: HASH_ALG_MD_5
+ value: "3942447fac867ae5cdb3229b658f4d48"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_1
+ value: "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_256
+ value: "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_512
+ value: "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ licenses {
+ expression: "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0"
+ acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED
+ bom_ref: "my-license"
+ }
+ purl: "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+}
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.6.xml b/tools/src/test/resources/1.7/valid-license-expression-1.6.xml
new file mode 100644
index 00000000..77035ad7
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-expression-1.6.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <expression bom-ref="my-license" acknowledgement="declared">EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0</expression>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.6.json b/tools/src/test/resources/1.7/valid-license-id-1.6.json
new file mode 100644
index 00000000..f66e2dfc
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-id-1.6.json
@@ -0,0 +1,46 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "application",
+ "publisher": "Acme Inc",
+ "group": "com.acme",
+ "name": "tomcat-catalina",
+ "version": "9.0.14",
+ "description": "Modified version of Apache Catalina",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "MD5",
+ "content": "3942447fac867ae5cdb3229b658f4d48"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ ],
+ "licenses": [
+ {
+ "license": {
+ "id": "Apache-2.0",
+ "acknowledgement": "declared",
+ "bom-ref": "my-license"
+ }
+ }
+ ],
+ "purl": "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.6.textproto b/tools/src/test/resources/1.7/valid-license-id-1.6.textproto
new file mode 100644
index 00000000..2b9009d7
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-id-1.6.textproto
@@ -0,0 +1,39 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_APPLICATION
+ publisher: "Acme Inc"
+ group: "com.acme"
+ name: "tomcat-catalina"
+ version: "9.0.14"
+ description: "Modified version of Apache Catalina"
+ scope: SCOPE_REQUIRED
+ hashes {
+ alg: HASH_ALG_MD_5
+ value: "3942447fac867ae5cdb3229b658f4d48"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_1
+ value: "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_256
+ value: "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_512
+ value: "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ licenses {
+ license {
+ id: "Apache-2.0"
+ acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED
+ bom_ref: "my-license"
+ }
+ }
+ purl: "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+}
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.6.xml b/tools/src/test/resources/1.7/valid-license-id-1.6.xml
new file mode 100644
index 00000000..1ab6b94f
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-id-1.6.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license bom-ref="my-license" acknowledgement="declared">
+ <id>Apache-2.0</id>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-license-licensing-1.6.json b/tools/src/test/resources/1.7/valid-license-licensing-1.6.json
new file mode 100644
index 00000000..613e38a0
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-licensing-1.6.json
@@ -0,0 +1,56 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "publisher": "Acme Inc",
+ "group": "com.acme",
+ "name": "cryptographic-provider",
+ "version": "2.2.0",
+ "licenses": [
+ {
+ "license": {
+ "bom-ref": "acme-license-1",
+ "name": "Acme Commercial License",
+ "licensing": {
+ "altIds": [
+ "acme", "acme-license"
+ ],
+ "licensor": {
+ "organization": {
+ "name": "Acme Inc",
+ "contact": [
+ {
+ "name": "Acme Licensing Fulfillment",
+ "email": "licensing@example.com"
+ }
+ ]
+ }
+ },
+ "licensee": {
+ "organization": {
+ "name": "Example Co."
+ }
+ },
+ "purchaser": {
+ "individual": {
+ "name": "Samantha Wright",
+ "email": "samantha.wright@gmail.com",
+ "phone": "800-555-1212"
+ }
+ },
+ "purchaseOrder": "PO-12345",
+ "licenseTypes": ["appliance"],
+ "lastRenewal": "2022-04-13T20:20:39+00:00",
+ "expiration": "2023-04-13T20:20:39+00:00"
+ }
+ }
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-license-licensing-1.6.textproto b/tools/src/test/resources/1.7/valid-license-licensing-1.6.textproto
new file mode 100644
index 00000000..f6079d48
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-licensing-1.6.textproto
@@ -0,0 +1,54 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ publisher: "Acme Inc"
+ group: "com.acme"
+ name: "cryptographic-provider"
+ version: "2.2.0"
+ licenses {
+ license {
+ bom_ref: "acme-license-1"
+ name: "Acme Commercial License"
+ licensing {
+ altIds: "acme"
+ altIds: "acme-license"
+ licensor {
+ organization {
+ name: "Acme Inc"
+ contact {
+ name: "Acme Licensing Fulfillment"
+ email: "licensing@example.com"
+ }
+ }
+ }
+ licensee {
+ organization {
+ name: "Example Co."
+ }
+ }
+ purchaser {
+ individual {
+ name: "Samantha Wright"
+ email: "samantha.wright@gmail.com"
+ phone: "800-555-1212"
+ }
+ }
+ purchaseOrder: "PO-12345"
+ licenseTypes: LICENSING_TYPE_APPLIANCE
+ lastRenewal {
+ seconds: 1649881239
+ nanos: 3
+ }
+ expiration {
+ seconds: 1681417239
+ nanos: 3
+ }
+ }
+ }
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-license-licensing-1.6.xml b/tools/src/test/resources/1.7/valid-license-licensing-1.6.xml
new file mode 100644
index 00000000..6f620e84
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-licensing-1.6.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>cryptographic-provider</name>
+ <version>2.2.0</version>
+ <licenses>
+ <license bom-ref="acme-license-1">
+ <name>Acme Commercial License</name>
+ <licensing>
+ <altIds>
+ <altId>acme</altId>
+ <altId>acme-license</altId>
+ </altIds>
+ <licensor>
+ <organization>
+ <name>Acme Inc</name>
+ <contact>
+ <name>Acme Licensing Fulfillment</name>
+ <email>licensing@example.com</email>
+ </contact>
+ </organization>
+ </licensor>
+ <licensee>
+ <organization>
+ <name>Example Co.</name>
+ </organization>
+ </licensee>
+ <purchaser>
+ <individual>
+ <name>Samantha Wright</name>
+ <email>samantha.wright@gmail.com</email>
+ <phone>800-555-1212</phone>
+ </individual>
+ </purchaser>
+ <purchaseOrder>PO-12345</purchaseOrder>
+ <licenseTypes>
+ <licenseType>appliance</licenseType>
+ </licenseTypes>
+ <lastRenewal>2022-04-13T20:20:39+00:00</lastRenewal>
+ <expiration>2023-04-13T20:20:39+00:00</expiration>
+ </licensing>
+ </license>
+ </licenses>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.6.json b/tools/src/test/resources/1.7/valid-license-name-1.6.json
new file mode 100644
index 00000000..1afc8250
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-name-1.6.json
@@ -0,0 +1,45 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "application",
+ "publisher": "Acme Inc",
+ "group": "com.acme",
+ "name": "tomcat-catalina",
+ "version": "9.0.14",
+ "description": "Modified version of Apache Catalina",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "MD5",
+ "content": "3942447fac867ae5cdb3229b658f4d48"
+ },
+ {
+ "alg": "SHA-1",
+ "content": "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ },
+ {
+ "alg": "SHA-512",
+ "content": "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ ],
+ "licenses": [
+ {
+ "license": {
+ "name": "Apache License 2.0",
+ "bom-ref": "my-license"
+ }
+ }
+ ],
+ "purl": "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.6.textproto b/tools/src/test/resources/1.7/valid-license-name-1.6.textproto
new file mode 100644
index 00000000..a157dbd0
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-name-1.6.textproto
@@ -0,0 +1,38 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_APPLICATION
+ publisher: "Acme Inc"
+ group: "com.acme"
+ name: "tomcat-catalina"
+ version: "9.0.14"
+ description: "Modified version of Apache Catalina"
+ scope: SCOPE_REQUIRED
+ hashes {
+ alg: HASH_ALG_MD_5
+ value: "3942447fac867ae5cdb3229b658f4d48"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_1
+ value: "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_256
+ value: "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_512
+ value: "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
+ }
+ licenses {
+ license {
+ name: "Apache License 2.0"
+ bom_ref: "my-license"
+ }
+ }
+ purl: "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+}
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.6.xml b/tools/src/test/resources/1.7/valid-license-name-1.6.xml
new file mode 100644
index 00000000..b6def92e
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-name-1.6.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license bom-ref="my-license">
+ <name>Apache License 2.0</name>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.6.json b/tools/src/test/resources/1.7/valid-machine-learning-1.6.json
new file mode 100644
index 00000000..dbd0ea7b
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-machine-learning-1.6.json
@@ -0,0 +1,94 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "bom-ref": "component-a",
+ "type": "machine-learning-model",
+ "publisher": "Acme Inc",
+ "group": "CompVis",
+ "name": "stable-diffusion",
+ "version": "1.4",
+ "description": "Stable Diffusion is a latent text-to-image diffusion model capable of generating photo-realistic images given any text input. For more information about how Stable Diffusion functions, please have a look at \uD83E\uDD17's Stable Diffusion with \uD83E\uDDE8Diffusers blog.",
+ "modelCard": {
+ "modelParameters": {
+ "approach": {
+ "type": "supervised"
+ },
+ "task": "task goes here",
+ "architectureFamily": "the architecture family goes here",
+ "modelArchitecture": "The architecture of the model.",
+ "datasets": [
+ {
+ "type": "dataset",
+ "name": "Training Data",
+ "contents": {
+ "url": "https://example.com/path/to/dataset"
+ },
+ "classification": "public"
+ }
+ ],
+ "inputs": [ { "format": "string" } ],
+ "outputs": [ { "format": "byte[]" } ]
+ },
+ "quantitativeAnalysis": {
+ "performanceMetrics": [
+ {
+ "type": "The type of performance metric",
+ "value": "The value of the performance metric",
+ "slice": "The name of the slice this metric was computed on. By default, assume this metric is not sliced",
+ "confidenceInterval": {
+ "lowerBound": "The lower bound of the confidence interval",
+ "upperBound": "The upper bound of the confidence interval"
+ }
+ }
+ ],
+ "graphics": {
+ "description": "Performance images",
+ "collection": [
+ {
+ "name": "FID vs CLIP Scores on 512x512 samples for different v1-versions",
+ "image": {
+ "contentType": "image/jpeg",
+ "encoding": "base64",
+ "content": "/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAIBAQEBAQIBAQECAgICAgQDAgICAgUEBAMEBgUGBgYFBgYGBwkIBgcJBwYGCAsICQoKCgoKBggLDAsKDAkKCgr/2wBDAQICAgICAgUDAwUKBwYHCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgr/wAARCAH4AxgDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD9/KKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAoooo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"
+ }
+ }
+ ]
+ }
+ },
+ "considerations": {
+ "users": [
+ "Who are the intended users of the model?"
+ ],
+ "useCases": [
+ "Who are the intended users of the model?"
+ ],
+ "technicalLimitations": [
+ "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?"
+ ],
+ "performanceTradeoffs": [
+ "What are the known tradeoffs in accuracy/performance of the model?"
+ ],
+ "ethicalConsiderations": [
+ {
+ "name": "The name of the risk",
+ "mitigationStrategy": "Strategy used to address this risk"
+ }
+ ],
+ "fairnessAssessments": [
+ {
+ "groupAtRisk": "The groups or individuals at risk of being systematically disadvantaged by the model",
+ "benefits": "Expected benefits to the identified groups",
+ "harms": "Expected harms to the identified groups",
+ "mitigationStrategy": "With respect to the benefits and harms outlined, please describe any mitigation strategy implemented."
+ }
+ ]
+ }
+ }
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.6.textproto b/tools/src/test/resources/1.7/valid-machine-learning-1.6.textproto
new file mode 100644
index 00000000..54452d65
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-machine-learning-1.6.textproto
@@ -0,0 +1,81 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_MACHINE_LEARNING_MODEL
+ bom_ref: "component-a"
+ publisher: "Acme Inc"
+ group: "CompVis"
+ name: "stable-diffusion"
+ version: "1.4"
+ description: "Stable Diffusion is a latent text-to-image diffusion model capable of generating photo-realistic images given any text input. For more information about how Stable Diffusion functions, please have a look at \uD83E\uDD17's Stable Diffusion with \uD83E\uDDE8Diffusers blog."
+ modelCard: {
+ modelParameters: {
+ approach: {
+ type: MODEL_PARAMETER_APPROACH_TYPE_SUPERVISED
+ }
+ task: "task goes here"
+ architectureFamily: "the architecture family goes here"
+ modelArchitecture: "The architecture of the model."
+ datasets: {
+ dataset: {
+ type: COMPONENT_DATA_TYPE_DATASET
+ name: "Training Data"
+ contents: {
+ url: "https://example.com/path/to/dataset"
+ }
+ classification: "public"
+ }
+ }
+ inputs: {
+ format: "string"
+ }
+ outputs: {
+ format: "byte[]"
+ }
+ }
+ quantitativeAnalysis: {
+ performanceMetrics: {
+ type: "The type of performance metric"
+ value: "The value of the performance metric"
+ slice: "The name of the slice this metric was computed on. By default, assume this metric is not sliced"
+ confidenceInterval: {
+ lowerBound: "The lower bound of the confidence interval"
+ upperBound: "The upper bound of the confidence interval"
+ }
+ }
+ graphics: {
+ description: "Performance images"
+ graphic: [
+ {
+ name: "FID vs CLIP Scores on 512x512 samples for different v1-versions"
+ image: {
+ content_type: "image/jpeg"
+ encoding: "base64"
+ value: "/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAIBAQEBAQIBAQECAgICAgQDAgICAgUEBAMEBgUGBgYFBgYGBwkIBgcJBwYGCAsICQoKCgoKBggLDAsKDAkKCgr/2wBDAQICAgICAgUDAwUKBwYHCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgr/wAARCAH4AxgDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD9/KKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAoooo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"
+ }
+ }
+ ]
+ }
+ }
+ considerations: {
+ users: "Who are the intended users of the model?"
+ useCases: "Who are the intended users of the model?"
+ technicalLimitations: "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?"
+ performanceTradeoffs: "What are the known tradeoffs in accuracy/performance of the model?"
+ ethicalConsiderations: {
+ name: "The name of the risk"
+ mitigationStrategy: "Strategy used to address this risk"
+ }
+ fairnessAssessments: {
+ groupAtRisk: "The groups or individuals at risk of being systematically disadvantaged by the model"
+ benefits: "Expected benefits to the identified groups"
+ harms: "Expected harms to the identified groups"
+ mitigationStrategy: "With respect to the benefits and harms outlined, please describe any mitigation strategy implemented."
+ }
+ }
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.6.xml b/tools/src/test/resources/1.7/valid-machine-learning-1.6.xml
new file mode 100644
index 00000000..6013b1c3
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-machine-learning-1.6.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="machine-learning-model" bom-ref="component-a">
+ <publisher>Acme Inc</publisher>
+ <group>CompVis</group>
+ <name>stable-diffusion</name>
+ <version>1.4</version>
+ <description>Stable Diffusion is a latent text-to-image diffusion model capable of generating photo-realistic images given any text input. For more information about how Stable Diffusion functions, please have a look at 🤗's Stable Diffusion with 🧨Diffusers blog.</description>
+ <modelCard>
+ <modelParameters>
+ <approach>
+ <type>supervised</type>
+ </approach>
+ <task>task goes here</task>
+ <architectureFamily>the architecture family goes here</architectureFamily>
+ <modelArchitecture>The architecture of the model.</modelArchitecture>
+ <datasets>
+ <dataset>
+ <type>dataset</type>
+ <name>Training Data</name>
+ <contents>
+ <url>https://example.com/path/to/dataset</url>
+ </contents>
+ <classification>public</classification>
+ </dataset>
+ </datasets>
+ <inputs>
+ <input>
+ <format>string</format>
+ </input>
+ </inputs>
+ <outputs>
+ <output>
+ <format>byte[]</format>
+ </output>
+ </outputs>
+ </modelParameters>
+ <quantitativeAnalysis>
+ <performanceMetrics>
+ <performanceMetric>
+ <type>The type of performance metric</type>
+ <value>The value of the performance metric</value>
+ <slice>The name of the slice this metric was computed on. By default, assume this metric is not sliced</slice>
+ <confidenceInterval>
+ <lowerBound>The lower bound of the confidence interval</lowerBound>
+ <upperBound>The upper bound of the confidence interval</upperBound>
+ </confidenceInterval>
+ </performanceMetric>
+ </performanceMetrics>
+ <graphics>
+ <description>Performance images</description>
+ <collection>
+ <graphic>
+ <name>FID vs CLIP Scores on 512x512 samples for different v1-versions</name>
+ <image encoding="base64" content-type="image/jpeg">/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAIBAQEBAQIBAQECAgICAgQDAgICAgUEBAMEBgUGBgYFBgYGBwkIBgcJBwYGCAsICQoKCgoKBggLDAsKDAkKCgr/2wBDAQICAgICAgUDAwUKBwYHCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgr/wAARCAH4AxgDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD9/KKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAoooo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</image>
+ </graphic>
+ </collection>
+ </graphics>
+ </quantitativeAnalysis>
+ <considerations>
+ <users>
+ <user>Who are the intended users of the model?</user>
+ </users>
+ <useCases>
+ <useCase>Who are the intended users of the model?</useCase>
+ </useCases>
+ <technicalLimitations>
+ <technicalLimitation>What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?</technicalLimitation>
+ </technicalLimitations>
+ <performanceTradeoffs>
+ <performanceTradeoff>What are the known tradeoffs in accuracy/performance of the model?</performanceTradeoff>
+ </performanceTradeoffs>
+ <ethicalConsiderations>
+ <ethicalConsideration>
+ <name>The name of the risk</name>
+ <mitigationStrategy>Strategy used to address this risk</mitigationStrategy>
+ </ethicalConsideration>
+ </ethicalConsiderations>
+ <fairnessAssessments>
+ <fairnessAssessment>
+ <groupAtRisk>The groups or individuals at risk of being systematically disadvantaged by the model</groupAtRisk>
+ <benefits>Expected benefits to the identified groups</benefits>
+ <harms>Expected harms to the identified groups</harms>
+ <mitigationStrategy>With respect to the benefits and harms outlined, please describe any mitigation strategy implemented.</mitigationStrategy>
+ </fairnessAssessment>
+ </fairnessAssessments>
+ </considerations>
+ </modelCard>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.json b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.json
new file mode 100644
index 00000000..07637f75
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.json
@@ -0,0 +1,66 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:ed5c5ba0-2be6-4b58-ac29-01a7fd375123",
+ "version": 1,
+ "components": [
+ {
+ "bom-ref": "huggingface.co-meta-llama-Llama-2-7b",
+ "group": "meta-llama",
+ "name": "Llama-2-7b",
+ "type": "machine-learning-model",
+ "supplier": {
+ "name": "Hugging Face"
+ },
+ "publisher": "meta",
+ "externalReferences": [
+ {
+ "type": "distribution",
+ "url": "https://huggingface.co/meta-llama/Llama-2-7b"
+ }
+ ],
+ "modelCard": {
+ "considerations": {
+ "environmentalConsiderations": {
+ "energyConsumptions": [
+ {
+ "activity": "training",
+ "energyProviders": [
+ {
+ "description": "Meta data-center, US-East",
+ "organization": {
+ "name": "Meta",
+ "address": {
+ "country": "United States",
+ "region": "New Jersey",
+ "locality": "Newark"
+ }
+ },
+ "energySource": "natural-gas",
+ "energyProvided": {
+ "value": 0.4,
+ "unit": "kWh"
+ }
+ }
+ ],
+ "activityEnergyCost": {
+ "value": 0.4,
+ "unit": "kWh"
+ },
+ "co2CostEquivalent": {
+ "value": 31.22,
+ "unit": "tCO2eq"
+ },
+ "co2CostOffset": {
+ "value": 31.22,
+ "unit": "tCO2eq"
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.textproto b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.textproto
new file mode 100644
index 00000000..c045c9e6
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.textproto
@@ -0,0 +1,57 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:ed5c5ba0-2be6-4b58-ac29-01a7fd375123"
+components {
+ type: CLASSIFICATION_MACHINE_LEARNING_MODEL
+ bom_ref: "huggingface.co-meta-llama-Llama-2-7b"
+ group: "meta-llama"
+ name: "Llama-2-7b"
+ publisher: "meta"
+ supplier {
+ name: "Hugging Face"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DISTRIBUTION
+ url: "https://huggingface.co/meta-llama/Llama-2-7b"
+ }
+ modelCard {
+ considerations {
+ environmentalConsiderations {
+ energyConsumptions {
+ activity: ACTIVITY_TYPE_TRAINING
+ activityEnergyCost {
+ value: 0.4
+ unit: ENERGY_MEASURE_UNIT_TYPE_KILOWATT_HOURS
+ }
+ energyProviders {
+ description: "Meta data-center, US-East"
+ organization {
+ name: "Meta"
+ address {
+ country: "United States"
+ region: "New Jersey"
+ locality: "Newark"
+ }
+ }
+ energySource: ENERGY_SOURCE_TYPE_NATURAL_GAS
+ energyProvided {
+ value: 0.4
+ unit: ENERGY_MEASURE_UNIT_TYPE_KILOWATT_HOURS
+ }
+ }
+ co2CostEquivalent {
+ value: 31.22
+ unit: CO2_MEASURE_UNIT_TYPE_TONNES_CO2_EQUIVALENT
+ }
+ co2CostOffset {
+ value: 31.22
+ unit: CO2_MEASURE_UNIT_TYPE_TONNES_CO2_EQUIVALENT
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.xml b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.xml
new file mode 100644
index 00000000..d4c54bc4
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.6" serialNumber="urn:uuid:ed5c5ba0-2be6-4b58-ac29-01a7fd375123" version="1">
+ <components>
+ <component type="machine-learning-model" bom-ref="huggingface.co-meta-llama-Llama-2-7b">
+ <supplier>
+ <name>Hugging Face</name>
+ </supplier>
+ <publisher>meta</publisher>
+ <group>meta-llama</group>
+ <name>Llama-2-7b</name>
+ <externalReferences>
+ <reference type="distribution">
+ <url>https://huggingface.co/meta-llama/Llama-2-7b</url>
+ </reference>
+ </externalReferences>
+ <modelCard>
+ <considerations>
+ <environmentalConsiderations>
+ <energyConsumptions>
+ <energyConsumption>
+ <activity>training</activity>
+ <energyProviders>
+ <description>Meta data-center, US-East</description>
+ <organization>
+ <name>Meta</name>
+ <address>
+ <country>United States</country>
+ <region>New Jersey</region>
+ <locality>Newark</locality>
+ </address>
+ </organization>
+ <energySource>natural-gas</energySource>
+ <energyProvided>
+ <value>0.4</value>
+ <unit>kWh</unit>
+ </energyProvided>
+ </energyProviders>
+ <activityEnergyCost>
+ <value>0.4</value>
+ <unit>kWh</unit>
+ </activityEnergyCost>
+ <co2CostEquivalent>
+ <value>31.22</value>
+ <unit>tCO2eq</unit>
+ </co2CostEquivalent>
+ <co2CostOffset>
+ <value>31.22</value>
+ <unit>tCO2eq</unit>
+ </co2CostOffset>
+ </energyConsumption>
+ </energyConsumptions>
+ </environmentalConsiderations>
+ </considerations>
+ </modelCard>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-metadata-author-1.6.json b/tools/src/test/resources/1.7/valid-metadata-author-1.6.json
new file mode 100644
index 00000000..196c0eca
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-author-1.6.json
@@ -0,0 +1,17 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "authors": [
+ {
+ "name": "Samantha Wright",
+ "email": "samantha.wright@example.com",
+ "phone": "800-555-1212"
+ }
+ ]
+ },
+ "components": []
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-author-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-author-1.6.textproto
new file mode 100644
index 00000000..0997b267
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-author-1.6.textproto
@@ -0,0 +1,13 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ authors {
+ name: "Samantha Wright"
+ email: "samantha.wright@example.com"
+ phone: "800-555-1212"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-author-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-author-1.6.xml
new file mode 100644
index 00000000..a8217789
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-author-1.6.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <authors>
+ <author>
+ <name>Samantha Wright</name>
+ <email>samantha.wright@example.com</email>
+ <phone>800-555-1212</phone>
+ </author>
+ </authors>
+ </metadata>
+ <components />
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-metadata-license-1.6.json b/tools/src/test/resources/1.7/valid-metadata-license-1.6.json
new file mode 100644
index 00000000..4861f5ab
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-license-1.6.json
@@ -0,0 +1,25 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "licenses": [
+ {
+ "license": {
+ "id": "Apache-2.0"
+ }
+ },
+ {
+ "license": {
+ "name": "My License",
+ "text": {
+ "content": "My License Text"
+ }
+ }
+ }
+ ]
+ },
+ "components": []
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-license-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-license-1.6.textproto
new file mode 100644
index 00000000..b761c2ec
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-license-1.6.textproto
@@ -0,0 +1,21 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ licenses {
+ license {
+ id: "Apache-2.0"
+ }
+ }
+ licenses {
+ license {
+ name: "My License"
+ text {
+ value: "My License Text"
+ }
+ }
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-license-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-license-1.6.xml
new file mode 100644
index 00000000..e8c02a31
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-license-1.6.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.6"
+ serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
+>
+ <metadata>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ </license>
+ <license>
+ <name>My License</name>
+ <text>My License Text</text>
+ </license>
+ </licenses>
+ </metadata>
+ <components/>
+</bom>
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.json b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.json
new file mode 100644
index 00000000..275ba3da
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.json
@@ -0,0 +1,22 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "lifecycles": [
+ {
+ "phase": "build"
+ },
+ {
+ "phase": "post-build"
+ },
+ {
+ "name": "platform-integration-testing",
+ "description": "Integration testing specific to the runtime platform"
+ }
+ ]
+ },
+ "components": []
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.textproto
new file mode 100644
index 00000000..6b47e0eb
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.textproto
@@ -0,0 +1,20 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ lifecycles [
+ {
+ phase: LIFECYCLE_PHASE_BUILD
+ },
+ {
+ phase: LIFECYCLE_PHASE_POST_BUILD
+ },
+ {
+ name: "platform-integration-testing"
+ description: "Integration testing specific to the runtime platform"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.xml
new file mode 100644
index 00000000..8b4a8458
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <lifecycles>
+ <lifecycle>
+ <phase>build</phase>
+ </lifecycle>
+ <lifecycle>
+ <phase>post-build</phase>
+ </lifecycle>
+ <lifecycle>
+ <name>platform-integration-testing</name>
+ <description>Integration testing specific to the runtime platform</description>
+ </lifecycle>
+ </lifecycles>
+ </metadata>
+ <components />
+</bom>
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.json b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.json
new file mode 100644
index 00000000..2c9b204a
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.json
@@ -0,0 +1,24 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "manufacture": {
+ "bom-ref": "manufacturer-1",
+ "name": "Acme, Inc. // deprecated",
+ "url": [
+ "https://example.com"
+ ],
+ "contact": [
+ {
+ "bom-ref": "contact-1",
+ "name": "Acme Professional Services",
+ "email": "professional.services@example.com"
+ }
+ ]
+ }
+ },
+ "components": []
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.textproto
new file mode 100644
index 00000000..aa5b216f
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.textproto
@@ -0,0 +1,18 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ manufacture {
+ name: "Acme, Inc. // deprecated"
+ url: "https://example.com"
+ contact {
+ name: "Acme Professional Services"
+ email: "professional.services@example.com"
+ bom_ref: "contact-1"
+ }
+ bom_ref: "manufacturer-1"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.xml
new file mode 100644
index 00000000..78ea7e22
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <manufacture bom-ref="manufacturer-1">
+ <name>Acme, Inc. // deprecated</name>
+ <url>https://example.com</url>
+ <contact bom-ref="contact-1">
+ <name>Acme Professional Services</name>
+ <email>professional.services@example.com</email>
+ </contact>
+ </manufacture>
+ </metadata>
+ <components />
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.json b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.json
new file mode 100644
index 00000000..0b373b3b
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.json
@@ -0,0 +1,24 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "manufacturer": {
+ "bom-ref": "manufacturer-1",
+ "name": "Acme, Inc.",
+ "url": [
+ "https://example.com"
+ ],
+ "contact": [
+ {
+ "bom-ref": "contact-1",
+ "name": "Acme Professional Services",
+ "email": "professional.services@example.com"
+ }
+ ]
+ }
+ },
+ "components": []
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.textproto
new file mode 100644
index 00000000..1ec04856
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.textproto
@@ -0,0 +1,18 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ manufacturer {
+ name: "Acme, Inc."
+ url: "https://example.com"
+ contact {
+ name: "Acme Professional Services"
+ email: "professional.services@example.com"
+ bom_ref: "contact-1"
+ }
+ bom_ref: "manufacturer-1"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.xml
new file mode 100644
index 00000000..94a536cc
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <manufacturer bom-ref="manufacturer-1">
+ <name>Acme, Inc.</name>
+ <url>https://example.com</url>
+ <contact bom-ref="contact-1">
+ <name>Acme Professional Services</name>
+ <email>professional.services@example.com</email>
+ </contact>
+ </manufacturer>
+ </metadata>
+ <components />
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.json b/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.json
new file mode 100644
index 00000000..e212c7a1
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.json
@@ -0,0 +1,24 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "supplier": {
+ "bom-ref": "supplier-1",
+ "name": "Acme, Inc.",
+ "url": [
+ "https://example.com"
+ ],
+ "contact": [
+ {
+ "bom-ref": "contact-1",
+ "name": "Acme Distribution",
+ "email": "distribution@example.com"
+ }
+ ]
+ }
+ },
+ "components": []
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.textproto
new file mode 100644
index 00000000..fe4bd39c
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.textproto
@@ -0,0 +1,18 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ supplier {
+ name: "Acme, Inc."
+ url: "https://example.com"
+ contact {
+ name: "Acme Distribution"
+ email: "distribution@example.com"
+ bom_ref: "contact-1"
+ }
+ bom_ref: "supplier-1"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.xml
new file mode 100644
index 00000000..213a2b37
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <supplier bom-ref="supplier-1">
+ <name>Acme, Inc.</name>
+ <url>https://example.com</url>
+ <contact bom-ref="contact-1">
+ <name>Acme Distribution</name>
+ <email>distribution@example.com</email>
+ </contact>
+ </supplier>
+ </metadata>
+ <components />
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.json b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.json
new file mode 100644
index 00000000..90c8f4ce
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.json
@@ -0,0 +1,11 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "timestamp": "2020-04-13T20:20:39+00:00"
+ },
+ "components": []
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.textproto
new file mode 100644
index 00000000..f276e2f8
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.textproto
@@ -0,0 +1,12 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ timestamp {
+ seconds: 1586809239
+ nanos: 0
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.xml
new file mode 100644
index 00000000..ed8322eb
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <timestamp>2020-04-13T20:20:39Z</timestamp>
+ </metadata>
+ <components />
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-1.6.json b/tools/src/test/resources/1.7/valid-metadata-tool-1.6.json
new file mode 100644
index 00000000..9c7b8b58
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-1.6.json
@@ -0,0 +1,48 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "tools": {
+ "components": [
+ {
+ "type": "application",
+ "group": "Awesome Vendor",
+ "name": "Awesome Tool",
+ "version": "9.1.2",
+ "hashes": [
+ {
+ "alg": "SHA-1",
+ "content": "25ed8e31b995bb927966616df2a42b979a2717f0"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "a74f733635a19aefb1f73e5947cef59cd7440c6952ef0f03d09d974274cbd6df"
+ }
+ ]
+ }
+ ],
+ "services": [
+ {
+ "provider": {
+ "name": "Acme Org",
+ "url": [
+ "https://example.com"
+ ]
+ },
+ "group": "com.example",
+ "name": "Acme Signing Server",
+ "description": "Signs artifacts",
+ "endpoints": [
+ "https://example.com/sign",
+ "https://example.com/verify",
+ "https://example.com/tsa"
+ ]
+ }
+ ]
+ }
+ },
+ "components": []
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-tool-1.6.textproto
new file mode 100644
index 00000000..872a92f2
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-1.6.textproto
@@ -0,0 +1,40 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ tools {
+ components {
+ type: CLASSIFICATION_APPLICATION
+ group: "Awesome Vendor"
+ name: "Awesome Tool"
+ version: "9.1.2"
+ hashes {
+ alg: HASH_ALG_SHA_1
+ value: "25ed8e31b995bb927966616df2a42b979a2717f0"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_256
+ value: "a74f733635a19aefb1f73e5947cef59cd7440c6952ef0f03d09d974274cbd6df"
+ }
+ }
+ services {
+ provider: {
+ name: "Acme Org",
+ url: [
+ "https://example.com"
+ ]
+ },
+ group: "com.example",
+ name: "Acme Signing Server",
+ description: "Signs artifacts",
+ endpoints: [
+ "https://example.com/sign",
+ "https://example.com/verify",
+ "https://example.com/tsa"
+ ]
+ }
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-tool-1.6.xml
new file mode 100644
index 00000000..8293686e
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-1.6.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <tools>
+ <components>
+ <component type="application">
+ <group>Awesome Vendor</group>
+ <name>Awesome Tool</name>
+ <version>9.1.2</version>
+ <hashes>
+ <hash alg="SHA-1">25ed8e31b995bb927966616df2a42b979a2717f0</hash>
+ <hash alg="SHA-256">a74f733635a19aefb1f73e5947cef59cd7440c6952ef0f03d09d974274cbd6df</hash>
+ </hashes>
+ </component>
+ </components>
+ <services>
+ <service>
+ <provider>
+ <name>Acme Org</name>
+ <url>https://example.com</url>
+ </provider>
+ <group>com.example</group>
+ <name>Acme Signing Server</name>
+ <description>Signs artifacts</description>
+ <endpoints>
+ <endpoint>https://example.com/sign</endpoint>
+ <endpoint>https://example.com/verify</endpoint>
+ <endpoint>https://example.com/tsa</endpoint>
+ </endpoints>
+ </service>
+ </services>
+ </tools>
+ </metadata>
+ <components />
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.json b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.json
new file mode 100644
index 00000000..485bdd11
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.json
@@ -0,0 +1,27 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "tools": [
+ {
+ "vendor": "Awesome Vendor",
+ "name": "Awesome Tool",
+ "version": "9.1.2",
+ "hashes": [
+ {
+ "alg": "SHA-1",
+ "content": "25ed8e31b995bb927966616df2a42b979a2717f0"
+ },
+ {
+ "alg": "SHA-256",
+ "content": "a74f733635a19aefb1f73e5947cef59cd7440c6952ef0f03d09d974274cbd6df"
+ }
+ ]
+ }
+ ]
+ },
+ "components": []
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.textproto
new file mode 100644
index 00000000..432b1eab
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.textproto
@@ -0,0 +1,21 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ tools {
+ vendor: "Awesome Vendor"
+ name: "Awesome Tool"
+ version: "9.1.2"
+ hashes {
+ alg: HASH_ALG_SHA_1
+ value: "25ed8e31b995bb927966616df2a42b979a2717f0"
+ }
+ hashes {
+ alg: HASH_ALG_SHA_256
+ value: "a74f733635a19aefb1f73e5947cef59cd7440c6952ef0f03d09d974274cbd6df"
+ }
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.xml
new file mode 100644
index 00000000..0f1dc4fa
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <tools>
+ <tool>
+ <vendor>Awesome Vendor</vendor>
+ <name>Awesome Tool</name>
+ <version>9.1.2</version>
+ <hashes>
+ <hash alg="SHA-1">25ed8e31b995bb927966616df2a42b979a2717f0</hash>
+ <hash alg="SHA-256">a74f733635a19aefb1f73e5947cef59cd7440c6952ef0f03d09d974274cbd6df</hash>
+ </hashes>
+ </tool>
+ </tools>
+ </metadata>
+ <components />
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-minimal-viable-1.6.json b/tools/src/test/resources/1.7/valid-minimal-viable-1.6.json
new file mode 100644
index 00000000..0ee56744
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-minimal-viable-1.6.json
@@ -0,0 +1,13 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-library"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-minimal-viable-1.6.textproto b/tools/src/test/resources/1.7/valid-minimal-viable-1.6.textproto
new file mode 100644
index 00000000..08ca51be
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-minimal-viable-1.6.textproto
@@ -0,0 +1,10 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "acme-library"
+}
diff --git a/tools/src/test/resources/1.7/valid-minimal-viable-1.6.xml b/tools/src/test/resources/1.7/valid-minimal-viable-1.6.xml
new file mode 100644
index 00000000..56e9c31d
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-minimal-viable-1.6.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>acme-library</name>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-patch-1.6.json b/tools/src/test/resources/1.7/valid-patch-1.6.json
new file mode 100644
index 00000000..2bb68e50
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-patch-1.6.json
@@ -0,0 +1,89 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "group": "com.acme",
+ "name": "sample-library",
+ "version": "1.0.0",
+ "pedigree": {
+ "ancestors": [
+ {
+ "type": "library",
+ "group": "org.example",
+ "name": "sample-library",
+ "version": "1.0.0"
+ }
+ ],
+ "patches": [
+ {
+ "type": "unofficial",
+ "diff": {
+ "text": {
+ "contentType": "text/plain",
+ "encoding": "base64",
+ "content": "blah"
+ },
+ "url": "uri/to/changes.diff"
+ },
+ "resolves": [
+ {
+ "type": "enhancement",
+ "id": "JIRA-17240",
+ "description": "Great new feature that does something",
+ "source": {
+ "name": "Acme Org",
+ "url": "https://issues.acme.org/17240"
+ }
+ }
+ ]
+ },
+ {
+ "type": "backport",
+ "diff": {
+ "text": {
+ "contentType": "text/plain",
+ "encoding": "base64",
+ "content": "blah"
+ },
+ "url": "uri/to/changes.diff"
+ },
+ "resolves": [
+ {
+ "type": "security",
+ "id": "CVE-2019-9997",
+ "name": "CVE-2019-9997",
+ "description": "blah blah",
+ "source": {
+ "name": "NVD",
+ "url": "https://nvd.nist.gov/vuln/detail/CVE-2019-9997"
+ },
+ "references": [
+ "http://some/other/site-1",
+ "http://some/other/site-2"
+ ]
+ },
+ {
+ "type": "defect",
+ "id": "JIRA-874319",
+ "description": "Enable to do something",
+ "source": {
+ "name": "Example Org",
+ "url": "https://issues.example.org/874319"
+ },
+ "references": [
+ "http://some/other/site-1",
+ "http://some/other/site-2"
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-patch-1.6.textproto b/tools/src/test/resources/1.7/valid-patch-1.6.textproto
new file mode 100644
index 00000000..2dd43f6b
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-patch-1.6.textproto
@@ -0,0 +1,74 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ group: "com.acme"
+ name: "sample-library"
+ version: "1.0.0"
+ pedigree {
+ ancestors {
+ type: CLASSIFICATION_LIBRARY
+ group: "org.example"
+ name: "sample-library"
+ version: "1.0.0"
+ }
+ patches {
+ type: PATCH_CLASSIFICATION_UNOFFICIAL
+ diff {
+ text {
+ content_type: "text/plain"
+ encoding: "base64"
+ value: "blah"
+ }
+ url: "uri/to/changes.diff"
+ }
+ resolves {
+ type: ISSUE_CLASSIFICATION_ENHANCEMENT
+ id: "JIRA-17240"
+ description: "Great new feature that does something"
+ source {
+ name: "Acme Org"
+ url: "https://issues.acme.org/17240"
+ }
+ }
+ }
+ patches {
+ type: PATCH_CLASSIFICATION_BACKPORT
+ diff {
+ text {
+ content_type: "text/plain"
+ encoding: "base64"
+ value: "blah"
+ }
+ url: "uri/to/changes.diff"
+ }
+ resolves {
+ type: ISSUE_CLASSIFICATION_SECURITY
+ id: "CVE-2019-9997"
+ name: "CVE-2019-9997"
+ description: "blah blah"
+ source {
+ name: "NVD"
+ url: "https://nvd.nist.gov/vuln/detail/CVE-2019-9997"
+ }
+ references: "http://some/other/site-1"
+ references: "http://some/other/site-2"
+ }
+ resolves {
+ type: ISSUE_CLASSIFICATION_DEFECT
+ id: "JIRA-874319"
+ description: "Enable to do something"
+ source {
+ name: "Example Org"
+ url: "https://issues.example.org/874319"
+ }
+ references: "http://some/other/site-1"
+ references: "http://some/other/site-2"
+ }
+ }
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-patch-1.6.xml b/tools/src/test/resources/1.7/valid-patch-1.6.xml
new file mode 100644
index 00000000..b543548e
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-patch-1.6.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <group>com.acme</group>
+ <name>sample-library</name>
+ <version>1.0.0</version>
+ <pedigree>
+ <ancestors>
+ <component type="library">
+ <group>org.example</group>
+ <name>sample-library</name>
+ <version>1.0.0</version>
+ </component>
+ </ancestors>
+ <patches>
+ <patch type="unofficial">
+ <diff>
+ <text content-type="text/plain" encoding="base64">blah</text>
+ <url>uri/to/changes.diff</url>
+ </diff>
+ <resolves>
+ <issue type="enhancement">
+ <id>JIRA-17240</id>
+ <description>Great new feature that does something</description>
+ <source>
+ <name>Acme Org</name>
+ <url>https://issues.acme.org/17240</url>
+ </source>
+ </issue>
+ </resolves>
+ </patch>
+ <patch type="backport">
+ <diff>
+ <text content-type="text/plain" encoding="base64">blah</text>
+ <url>uri/to/changes.diff</url>
+ </diff>
+ <resolves>
+ <issue type="security">
+ <id>CVE-2019-9997</id>
+ <name>CVE-2019-9997</name>
+ <description>blah blah</description>
+ <source>
+ <name>NVD</name>
+ <url>https://nvd.nist.gov/vuln/detail/CVE-2019-9997</url>
+ </source>
+ <references>
+ <url>http://some/other/site-1</url>
+ <url>http://some/other/site-2</url>
+ </references>
+ </issue>
+ <issue type="defect">
+ <id>JIRA-874319</id>
+ <description>Enable to do something</description>
+ <source>
+ <name>Example Org</name>
+ <url>https://issues.example.org/874319</url>
+ </source>
+ <references>
+ <url>http://some/other/site-1</url>
+ <url>http://some/other/site-2</url>
+ </references>
+ </issue>
+ </resolves>
+ </patch>
+ </patches>
+ </pedigree>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-properties-1.6.json b/tools/src/test/resources/1.7/valid-properties-1.6.json
new file mode 100644
index 00000000..ad62c6f9
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-properties-1.6.json
@@ -0,0 +1,101 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "properties": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ },
+ {
+ "name": "Foo",
+ "value": "Two"
+ },
+ {
+ "name": "Bar",
+ "value": "Foo"
+ },
+ {
+ "name": "value-is-optional"
+ }
+ ]
+ },
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-library",
+ "version": "1.0.0",
+ "licenses": [
+ {
+ "license": {
+ "id": "Apache-2.0",
+ "properties": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ },
+ {
+ "name": "Foo",
+ "value": "Two"
+ },
+ {
+ "name": "Bar",
+ "value": "Foo"
+ },
+ {
+ "name": "value-is-optional"
+ }
+ ]
+ }
+ }
+ ],
+ "properties": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ },
+ {
+ "name": "Foo",
+ "value": "Two"
+ },
+ {
+ "name": "Bar",
+ "value": "Foo"
+ },
+ {
+ "name": "value-is-optional"
+ }
+ ]
+ }
+ ],
+ "services": [
+ {
+ "bom-ref": "b2a46a4b-8367-4bae-9820-95557cfe03a8",
+ "group": "org.partner",
+ "name": "Stock ticker service",
+ "endpoints": [
+ "https://partner.org/api/v1/stock"
+ ],
+ "properties": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ },
+ {
+ "name": "Foo",
+ "value": "Two"
+ },
+ {
+ "name": "Bar",
+ "value": "Foo"
+ },
+ {
+ "name": "value-is-optional"
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-properties-1.6.textproto b/tools/src/test/resources/1.7/valid-properties-1.6.textproto
new file mode 100644
index 00000000..33870683
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-properties-1.6.textproto
@@ -0,0 +1,84 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ properties {
+ name: "Foo"
+ value: "Bar"
+ }
+ properties {
+ name: "Foo"
+ value: "Two"
+ }
+ properties {
+ name: "Bar"
+ value: "Foo"
+ }
+ properties {
+ name: "value-is-optional"
+ }
+}
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "acme-library"
+ version: "1.0.0"
+ licenses {
+ license {
+ id: "Apache-2.0"
+ properties {
+ name: "Foo"
+ value: "Bar"
+ }
+ properties {
+ name: "Foo"
+ value: "Two"
+ }
+ properties {
+ name: "Bar"
+ value: "Foo"
+ }
+ properties {
+ name: "value-is-optional"
+ }
+ }
+ }
+ properties {
+ name: "Foo"
+ value: "Bar"
+ }
+ properties {
+ name: "Foo"
+ value: "Two"
+ }
+ properties {
+ name: "Bar"
+ value: "Foo"
+ }
+ properties {
+ name: "value-is-optional"
+ }
+}
+services {
+ bom_ref: "b2a46a4b-8367-4bae-9820-95557cfe03a8"
+ group: "org.partner"
+ name: "Stock ticker service"
+ endpoints: "https://partner.org/api/v1/stock"
+ properties {
+ name: "Foo"
+ value: "Bar"
+ }
+ properties {
+ name: "Foo"
+ value: "Two"
+ }
+ properties {
+ name: "Bar"
+ value: "Foo"
+ }
+ properties {
+ name: "value-is-optional"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-properties-1.6.xml b/tools/src/test/resources/1.7/valid-properties-1.6.xml
new file mode 100644
index 00000000..ac03d4b8
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-properties-1.6.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <properties>
+ <property name="Foo">Bar</property>
+ <property name="Foo">Two</property>
+ <property name="Bar">Foo</property>
+ <property name="value-is-optional"/>
+ </properties>
+ </metadata>
+ <components>
+ <component type="library">
+ <name>acme-library</name>
+ <version>1.0.0</version>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ <properties>
+ <property name="Foo">Bar</property>
+ <property name="Foo">Two</property>
+ <property name="Bar">Foo</property>
+ <property name="value-is-optional"/>
+ </properties>
+ </license>
+ </licenses>
+ <properties>
+ <property name="Foo">Bar</property>
+ <property name="Foo">Two</property>
+ <property name="Bar">Foo</property>
+ <property name="value-is-optional"/>
+ </properties>
+ </component>
+ </components>
+ <services>
+ <service bom-ref="b2a46a4b-8367-4bae-9820-95557cfe03a8">
+ <group>org.partner</group>
+ <name>Stock ticker service</name>
+ <endpoints>
+ <endpoint>https://partner.org/api/v1/stock</endpoint>
+ </endpoints>
+ <properties>
+ <property name="Foo">Bar</property>
+ <property name="Foo">Two</property>
+ <property name="Bar">Foo</property>
+ <property name="value-is-optional"/>
+ </properties>
+ </service>
+ </services>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-random-attributes-1.6.xml b/tools/src/test/resources/1.7/valid-random-attributes-1.6.xml
new file mode 100644
index 00000000..ce0be1cb
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-random-attributes-1.6.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<bom foo="bar" bar="foo" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components foo="bar" bar="foo" >
+ <component foo="bar" bar="foo" type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Modified version of Apache Catalina</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ <text content-type="text/plain" encoding="base64">
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.</text>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ <pedigree>
+ <ancestors foo="bar" bar="foo">
+ <component type="application">
+ <publisher>Apache</publisher>
+ <group>org.apache.tomcat</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <description>Apache Catalina</description>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ </license>
+ </licenses>
+ <purl>pkg:maven/org.apache.tomcat/tomcat-catalina@9.0.14?packaging=jar</purl>
+ </component>
+ </ancestors>
+ <commits>
+ <commit>
+ <uid>7638417db6d59f3c431d3e1f261cc637155684cd</uid>
+ <url>https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd</url>
+ <author>
+ <timestamp>2018-11-07T22:01:45Z</timestamp>
+ <name>John Doe</name>
+ <email>john.doe@example.com</email>
+ </author>
+ <committer>
+ <timestamp>2018-11-07T22:01:45Z</timestamp>
+ <name>Jane Doe</name>
+ <email>jane.doe@example.com</email>
+ </committer>
+ <message>Initial commit</message>
+ </commit>
+ </commits>
+ <notes>Commentary here</notes>
+ </pedigree>
+ </component>
+ <component type="library">
+ <group>org.example</group>
+ <name>mylibrary</name>
+ <version>1.0.0</version>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">2342c2eaf1feb9a80195dbaddf2ebaa3</hash>
+ <hash alg="SHA-1">68b78babe00a053f9e35ec6a2d9080f5b90122b0</hash>
+ <hash alg="SHA-256">708f1f53b41f11f02d12a11b1a38d2905d47b099afc71a0f1124ef8582ec7313</hash>
+ <hash alg="SHA-512">387b7ae16b9cae45f830671541539bf544202faae5aac544a93b7b0a04f5f846fa2f4e81ef3f1677e13aed7496408a441f5657ab6d54423e56bf6f38da124aef</hash>
+ </hashes>
+ <licenses>
+ <expression>EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0</expression>
+ </licenses>
+ <copyright>Copyright Example Inc. All rights reserved.</copyright>
+ <cpe>cpe:/a:example:myapplication:1.0.0</cpe>
+ <purl>pkg:maven/com.example/myapplication@1.0.0?packaging=war</purl>
+ <modified>false</modified>
+ <externalReferences>
+ <reference type="documentation">
+ <url>http://example.org/docs</url>
+ <comment>All component versions are documented here</comment>
+ </reference>
+ <reference type="advisories">
+ <url>http://example.org/security</url>
+ </reference>
+ </externalReferences>
+ </component>
+ <component type="framework">
+ <group>com.example</group>
+ <name>myframework</name>
+ <version>1.0.0</version>
+ <description>Example Inc, enterprise framework</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">cfcb0b64aacd2f81c1cd546543de965a</hash>
+ <hash alg="SHA-1">7fbeef2346c45d565c3341f037bce4e088af8a52</hash>
+ <hash alg="SHA-256">0384db3cec55d86a6898c489fdb75a8e75fe66b26639634983d2f3c3558493d1</hash>
+ <hash alg="SHA-512">854909cdb9e3ca183056837144aab6d8069b377bd66445087cc7157bf0c3f620418705dd0b83bdc2f73a508c2bdb316ca1809d75ee6972d02023a3e7dd655c79</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <name>Some random license</name>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.example/myframework@1.0.0?packaging=war</purl>
+ <modified>false</modified>
+ <externalReferences>
+ <reference type="website">
+ <url>http://example.com/myframework</url>
+ </reference>
+ <reference type="advisories">
+ <url>http://example.com/security</url>
+ </reference>
+ </externalReferences>
+ </component>
+ </components>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-release-notes-1.6.json b/tools/src/test/resources/1.7/valid-release-notes-1.6.json
new file mode 100644
index 00000000..0be9e48a
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-release-notes-1.6.json
@@ -0,0 +1,201 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "acme-example",
+ "version": "1.0.0",
+ "externalReferences": [
+ {
+ "type": "release-notes",
+ "url": "https://example.com/releases/1.0.0"
+ }
+ ],
+ "releaseNotes": {
+ "type": "major",
+ "title": "My new release",
+ "featuredImage": "https://example.com/featured_image.png",
+ "socialImage": "https://example.com/social_image.png",
+ "description": "The main description of your release",
+ "timestamp": "2021-09-17T00:51:18+00:00",
+ "aliases": [
+ "Project Orion"
+ ],
+ "tags": [
+ "CMS",
+ "SEO",
+ "wysiwyg"
+ ],
+ "resolves": [
+ {
+ "type": "enhancement",
+ "id": "JIRA-17240",
+ "description": "Great new feature that does something",
+ "source": {
+ "name": "Acme Org",
+ "url": "https://issues.example.com/17240"
+ }
+ },
+ {
+ "type": "security",
+ "id": "CVE-2019-9997",
+ "name": "CVE-2019-9997",
+ "description": "A security issue was fixed that did something bad",
+ "source": {
+ "name": "NVD",
+ "url": "https://nvd.nist.gov/vuln/detail/CVE-2019-9997"
+ },
+ "references": [
+ "http://some/other/site-1",
+ "http://some/other/site-2"
+ ]
+ }
+ ],
+ "notes": [
+ {
+ "locale": "en-US",
+ "text": {
+ "contentType": "text/html",
+ "encoding": "base64",
+ "content": "PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5SZWxlYXNlIG5vdGVzIGhlcmU8L3A+"
+ }
+ },
+ {
+ "locale": "es",
+ "text": {
+ "contentType": "text/html",
+ "encoding": "base64",
+ "content": "PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5Ob3RhcyBkZSBsYSB2ZXJzacOzbiBhcXXDrTwvcD4="
+ }
+ }
+ ]
+ }
+ }
+ ],
+ "services": [
+ {
+ "bom-ref": "b2a46a4b-8367-4bae-9820-95557cfe03a8",
+ "provider": {
+ "name": "Partner Org",
+ "url": [
+ "https://partner.org"
+ ],
+ "contact": [
+ {
+ "name": "Support",
+ "email": "support@partner.org",
+ "phone": "800-555-1212"
+ }
+ ]
+ },
+ "group": "org.partner",
+ "name": "Stock ticker service",
+ "version": "2020-Q2",
+ "description": "Provides real-time stock information",
+ "endpoints": [
+ "https://partner.org/api/v1/lookup",
+ "https://partner.org/api/v1/stock"
+ ],
+ "authenticated": true,
+ "x-trust-boundary": true,
+ "data": [
+ {
+ "classification": "PII",
+ "flow": "inbound"
+ },
+ {
+ "classification": "PIFI",
+ "flow": "outbound"
+ },
+ {
+ "classification": "public",
+ "flow": "bi-directional"
+ },
+ {
+ "classification": "partner-data",
+ "flow": "unknown"
+ }
+ ],
+ "licenses": [
+ {
+ "license": {
+ "name": "Partner license"
+ }
+ }
+ ],
+ "externalReferences": [
+ {
+ "type": "website",
+ "url": "http://partner.org"
+ },
+ {
+ "type": "documentation",
+ "url": "http://api.partner.org/swagger"
+ }
+ ],
+ "releaseNotes": {
+ "type": "major",
+ "title": "My new release",
+ "featuredImage": "https://example.com/featured_image.png",
+ "socialImage": "https://example.com/social_image.png",
+ "description": "The main description of your release",
+ "timestamp": "2021-09-17T00:51:18+00:00",
+ "aliases": [
+ "Project Orion"
+ ],
+ "tags": [
+ "CMS",
+ "SEO",
+ "wysiwyg"
+ ],
+ "resolves": [
+ {
+ "type": "enhancement",
+ "id": "JIRA-17240",
+ "description": "Great new feature that does something",
+ "source": {
+ "name": "Acme Org",
+ "url": "https://issues.example.com/17240"
+ }
+ },
+ {
+ "type": "security",
+ "id": "CVE-2019-9997",
+ "name": "CVE-2019-9997",
+ "description": "A security issue was fixed that did something bad",
+ "source": {
+ "name": "NVD",
+ "url": "https://nvd.nist.gov/vuln/detail/CVE-2019-9997"
+ },
+ "references": [
+ "http://some/other/site-1",
+ "http://some/other/site-2"
+ ]
+ }
+ ],
+ "notes": [
+ {
+ "locale": "en-US",
+ "text": {
+ "contentType": "text/html",
+ "encoding": "base64",
+ "content": "PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5SZWxlYXNlIG5vdGVzIGhlcmU8L3A+"
+ }
+ },
+ {
+ "locale": "es",
+ "text": {
+ "contentType": "text/html",
+ "encoding": "base64",
+ "content": "PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5Ob3RhcyBkZSBsYSB2ZXJzacOzbiBhcXXDrTwvcD4="
+ }
+ }
+ ]
+ }
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-release-notes-1.6.textproto b/tools/src/test/resources/1.7/valid-release-notes-1.6.textproto
new file mode 100644
index 00000000..9870ee17
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-release-notes-1.6.textproto
@@ -0,0 +1,168 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "acme-example"
+ version: "1.0.0"
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_RELEASE_NOTES
+ url: "https://example.com/releases/1.0.0"
+ }
+ releaseNotes: {
+ type: "major"
+ title: "My new release"
+ featuredImage: "https://example.com/featured_image.png"
+ socialImage: "https://example.com/social_image.png"
+ description: "The main description of your release"
+ timestamp {
+ seconds: 1631839878
+ nanos: 0
+ }
+ aliases: "Project Orion"
+ tags: "CMS"
+ tags: "SEO"
+ tags: "wysiwyg"
+ resolves {
+ type: ISSUE_CLASSIFICATION_ENHANCEMENT
+ id: "JIRA-17240"
+ description: "Great new feature that does something"
+ source {
+ name: "Acme Org"
+ url: "https://issues.example.com/17240"
+ }
+ }
+ resolves {
+ type: ISSUE_CLASSIFICATION_SECURITY
+ id: "CVE-2019-9997"
+ name: "CVE-2019-9997"
+ description: "A security issue was fixed that did something bad"
+ source {
+ name: "NVD"
+ url: "https://nvd.nist.gov/vuln/detail/CVE-2019-9997"
+ }
+ references: "http://some/other/site-1"
+ references: "http://some/other/site-2"
+ }
+ notes {
+ locale: "en-US"
+ text: {
+ content_type: "text/html"
+ encoding: "base64"
+ value: "PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5SZWxlYXNlIG5vdGVzIGhlcmU8L3A+"
+ }
+ }
+ notes {
+ locale: "es",
+ text: {
+ content_type: "text/html"
+ encoding: "base64"
+ value: "PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5Ob3RhcyBkZSBsYSB2ZXJzacOzbiBhcXXDrTwvcD4="
+ }
+ }
+ }
+}
+services {
+ bom_ref: "b2a46a4b-8367-4bae-9820-95557cfe03a8"
+ provider {
+ name: "Partner Org"
+ url: "https://partner.org"
+ contact {
+ name: "Support"
+ email: "support@partner.org"
+ phone: "800-555-1212"
+ }
+ }
+ group: "org.partner"
+ name: "Stock ticker service"
+ version: "2020-Q2"
+ description: "Provides real-time stock information"
+ endpoints: "https://partner.org/api/v1/lookup"
+ endpoints: "https://partner.org/api/v1/stock"
+ authenticated: true
+ x_trust_boundary: true
+ data {
+ flow: DATA_FLOW_INBOUND
+ value: "PII"
+ }
+ data {
+ flow: DATA_FLOW_OUTBOUND
+ value: "PIFI"
+ }
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "public"
+ }
+ data {
+ flow: DATA_FLOW_UNKNOWN
+ value: "partner-data"
+ }
+ licenses {
+ license {
+ name: "Partner license"
+ }
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_WEBSITE
+ url: "http://partner.org"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DOCUMENTATION
+ url: "http://api.partner.org/swagger"
+ }
+ releaseNotes: {
+ type: "major"
+ title: "My new release"
+ featuredImage: "https://example.com/featured_image.png"
+ socialImage: "https://example.com/social_image.png"
+ description: "The main description of your release"
+ timestamp {
+ seconds: 1631839878
+ nanos: 0
+ }
+ aliases: "Project Orion"
+ tags: "CMS"
+ tags: "SEO"
+ tags: "wysiwyg"
+ resolves {
+ type: ISSUE_CLASSIFICATION_ENHANCEMENT
+ id: "JIRA-17240"
+ description: "Great new feature that does something"
+ source {
+ name: "Acme Org"
+ url: "https://issues.example.com/17240"
+ }
+ }
+ resolves {
+ type: ISSUE_CLASSIFICATION_SECURITY
+ id: "CVE-2019-9997"
+ name: "CVE-2019-9997"
+ description: "A security issue was fixed that did something bad"
+ source {
+ name: "NVD"
+ url: "https://nvd.nist.gov/vuln/detail/CVE-2019-9997"
+ }
+ references: "http://some/other/site-1"
+ references: "http://some/other/site-2"
+ }
+ notes {
+ locale: "en-US"
+ text: {
+ content_type: "text/html"
+ encoding: "base64"
+ value: "PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5SZWxlYXNlIG5vdGVzIGhlcmU8L3A+"
+ }
+ }
+ notes {
+ locale: "es",
+ text: {
+ content_type: "text/html"
+ encoding: "base64"
+ value: "PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5Ob3RhcyBkZSBsYSB2ZXJzacOzbiBhcXXDrTwvcD4="
+ }
+ }
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-release-notes-1.6.xml b/tools/src/test/resources/1.7/valid-release-notes-1.6.xml
new file mode 100644
index 00000000..15caa355
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-release-notes-1.6.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>acme-example</name>
+ <version>1.0.0</version>
+ <externalReferences>
+ <reference type="release-notes">
+ <url>https://example.com/releases/1.0.0</url>
+ </reference>
+ </externalReferences>
+ <releaseNotes>
+ <type>major</type>
+ <title>My new release</title>
+ <featuredImage>https://example.com/featured_image.png</featuredImage>
+ <socialImage>https://example.com/social_image.png</socialImage>
+ <description>The main description of your release</description>
+ <timestamp>2021-09-17T00:51:18+00:00</timestamp>
+ <aliases>
+ <alias>Project Orion</alias>
+ </aliases>
+ <tags>
+ <tag>CMS</tag>
+ <tag>SEO</tag>
+ <tag>wysiwyg</tag>
+ </tags>
+ <resolves>
+ <issue type="enhancement">
+ <id>JIRA-17240</id>
+ <description>Great new feature that does something</description>
+ <source>
+ <name>Acme Org</name>
+ <url>https://issues.example.com/17240</url>
+ </source>
+ </issue>
+ <issue type="security">
+ <id>CVE-2019-9997</id>
+ <name>CVE-2019-9997</name>
+ <description>A security issue was fixed that did something bad</description>
+ <source>
+ <name>NVD</name>
+ <url>https://nvd.nist.gov/vuln/detail/CVE-2019-9997</url>
+ </source>
+ <references>
+ <url>http://some/other/site-1</url>
+ <url>http://some/other/site-2</url>
+ </references>
+ </issue>
+ </resolves>
+ <notes>
+ <note>
+ <locale>en-US</locale>
+ <text content-type="text/html" encoding="base64">PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5SZWxlYXNlIG5vdGVzIGhlcmU8L3A+</text>
+ </note>
+ <note>
+ <locale>es</locale>
+ <text content-type="text/html" encoding="base64">PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5Ob3RhcyBkZSBsYSB2ZXJzacOzbiBhcXXDrTwvcD4=</text>
+ </note>
+ </notes>
+ </releaseNotes>
+ </component>
+ </components>
+ <services>
+ <service bom-ref="b2a46a4b-8367-4bae-9820-95557cfe03a8">
+ <provider>
+ <name>Partner Org</name>
+ <url>https://partner.org</url>
+ <contact>
+ <name>Support</name>
+ <email>support@partner.org</email>
+ <phone>800-555-1212</phone>
+ </contact>
+ </provider>
+ <group>org.partner</group>
+ <name>Stock ticker service</name>
+ <version>2020-Q2</version>
+ <description>Provides real-time stock information</description>
+ <endpoints>
+ <endpoint>https://partner.org/api/v1/lookup</endpoint>
+ <endpoint>https://partner.org/api/v1/stock</endpoint>
+ </endpoints>
+ <authenticated>true</authenticated>
+ <x-trust-boundary>true</x-trust-boundary>
+ <data>
+ <classification flow="inbound">PII</classification>
+ <classification flow="outbound">PIFI</classification>
+ <classification flow="bi-directional">public</classification>
+ <classification flow="unknown">partner-data</classification>
+ </data>
+ <licenses>
+ <license>
+ <name>Partner license</name>
+ </license>
+ </licenses>
+ <externalReferences>
+ <reference type="website">
+ <url>http://partner.org</url>
+ </reference>
+ <reference type="documentation">
+ <url>http://api.partner.org/swagger</url>
+ </reference>
+ </externalReferences>
+ <releaseNotes>
+ <type>major</type>
+ <title>My new release</title>
+ <featuredImage>https://example.com/featured_image.png</featuredImage>
+ <socialImage>https://example.com/social_image.png</socialImage>
+ <description>The main description of your release</description>
+ <timestamp>2021-09-17T00:51:18+00:00</timestamp>
+ <aliases>
+ <alias>Project Orion</alias>
+ </aliases>
+ <tags>
+ <tag>CMS</tag>
+ <tag>SEO</tag>
+ <tag>wysiwyg</tag>
+ </tags>
+ <resolves>
+ <issue type="enhancement">
+ <id>JIRA-17240</id>
+ <description>Great new feature that does something</description>
+ <source>
+ <name>Acme Org</name>
+ <url>https://issues.example.com/17240</url>
+ </source>
+ </issue>
+ <issue type="security">
+ <id>CVE-2019-9997</id>
+ <name>CVE-2019-9997</name>
+ <description>A security issue was fixed that did something bad</description>
+ <source>
+ <name>NVD</name>
+ <url>https://nvd.nist.gov/vuln/detail/CVE-2019-9997</url>
+ </source>
+ <references>
+ <url>http://some/other/site-1</url>
+ <url>http://some/other/site-2</url>
+ </references>
+ </issue>
+ </resolves>
+ <notes>
+ <note>
+ <locale>en-US</locale>
+ <text content-type="text/html" encoding="base64">PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5SZWxlYXNlIG5vdGVzIGhlcmU8L3A+</text>
+ </note>
+ <note>
+ <locale>es</locale>
+ <text content-type="text/html" encoding="base64">PGgxPk15IG5ldyByZWxlYXNlPGgxPgo8cD5Ob3RhcyBkZSBsYSB2ZXJzacOzbiBhcXXDrTwvcD4=</text>
+ </note>
+ </notes>
+ </releaseNotes>
+ </service>
+ </services>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-saasbom-1.6.json b/tools/src/test/resources/1.7/valid-saasbom-1.6.json
new file mode 100644
index 00000000..0aa16dd0
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-saasbom-1.6.json
@@ -0,0 +1,304 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "timestamp": "2021-01-10T12:00:00Z",
+ "component": {
+ "bom-ref": "acme-stock-application",
+ "type": "application",
+ "name": "Acme SaaSBOM Example",
+ "version": "2022-1"
+ }
+ },
+ "services": [
+ {
+ "bom-ref": "stock-ticker-service",
+ "provider": {
+ "name": "Acme Inc",
+ "url": [ "https://example.com" ]
+ },
+ "group": "com.example",
+ "name": "Stock Ticker Service",
+ "version": "2022-1",
+ "endpoints": [
+ "https://example.com/",
+ "https://example.com/app"
+ ],
+ "authenticated": true,
+ "trustZone": "Acme Public Zone",
+ "data": [
+ {
+ "name": "Consumer to Stock Service",
+ "description": "Traffic to/from consumer to service",
+ "classification": "Customer",
+ "flow": "bi-directional",
+ "source": [
+ "https://0.0.0.0"
+ ],
+ "destination": [
+ "https://0.0.0.0"
+ ]
+ },
+ {
+ "name": "Stock Service to MS-1",
+ "description": "Traffic to/from stock service to microservice-1",
+ "classification": "PII",
+ "flow": "bi-directional",
+ "source": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com"
+ ],
+ "destination": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com"
+ ]
+ },
+ {
+ "name": "Stock Service to MS-2",
+ "description": "Traffic to/from stock service to microservice-2",
+ "classification": "PIFI",
+ "flow": "bi-directional",
+ "source": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-2.example.com"
+ ],
+ "destination": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-2.example.com"
+ ]
+ },
+ {
+ "name": "Stock Service to MS-3",
+ "description": "Traffic to/from stock service to microservice-3",
+ "classification": "Public",
+ "flow": "bi-directional",
+ "source": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-3.example.com"
+ ],
+ "destination": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-3.example.com"
+ ]
+ }
+ ],
+ "externalReferences": [
+ {
+ "type": "documentation",
+ "url": "https://example.com/app/swagger"
+ }
+ ],
+ "services": [
+ {
+ "bom-ref": "ms-1.example.com",
+ "provider": {
+ "name": "Acme Inc",
+ "url": [ "https://example.com" ]
+ },
+ "group": "com.example",
+ "name": "Microservice 1",
+ "version": "2022-1",
+ "description": "Example Microservice",
+ "endpoints": [
+ "https://ms-1.example.com"
+ ],
+ "authenticated": true,
+ "trustZone": "Acme Private Zone",
+ "data": [
+ {
+ "name": "Stock Service to MS-1",
+ "description": "Traffic to/from stock service to microservice-1",
+ "classification": "PII",
+ "flow": "bi-directional",
+ "governance": {
+ "owners": [
+ {
+ "organization": {
+ "name": "Customer Name"
+ }
+ }
+ ]
+ },
+ "source": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ ],
+ "destination": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ ]
+ },
+ {
+ "name": "MS-1 to Database",
+ "description": "Traffic to/from microservice-1 to database",
+ "classification": "PII",
+ "flow": "bi-directional",
+ "source": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1-pgsql.example.com"
+ ],
+ "destination": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1-pgsql.example.com"
+ ]
+ }
+ ],
+ "externalReferences": [
+ {
+ "type": "documentation",
+ "url": "https://ms-1.example.com/swagger"
+ }
+ ]
+ },
+ {
+ "bom-ref": "ms-2.example.com",
+ "provider": {
+ "name": "Acme Inc",
+ "url": [ "https://example.com" ]
+ },
+ "group": "com.example",
+ "name": "Microservice 2",
+ "version": "2022-1",
+ "description": "Example Microservice",
+ "endpoints": [
+ "https://ms-2.example.com"
+ ],
+ "authenticated": true,
+ "trustZone": "Acme Private Zone",
+ "data": [
+ {
+ "name": "Stock Service to MS-2",
+ "description": "Traffic to/from stock service to microservice-2",
+ "classification": "PIFI",
+ "flow": "bi-directional",
+ "source": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ ],
+ "destination": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ ]
+ }
+ ],
+ "externalReferences": [
+ {
+ "type": "documentation",
+ "url": "https://ms-2.example.com/swagger"
+ }
+ ]
+ },
+ {
+ "bom-ref": "ms-3.example.com",
+ "provider": {
+ "name": "Acme Inc",
+ "url": [ "https://example.com" ]
+ },
+ "group": "com.example",
+ "name": "Microservice 3",
+ "version": "2022-1",
+ "description": "Example Microservice",
+ "endpoints": [
+ "https://ms-3.example.com"
+ ],
+ "authenticated": true,
+ "trustZone": "Acme Private Zone",
+ "data": [
+ {
+ "name": "Stock Service to MS-3",
+ "description": "Traffic to/from stock service to microservice-3",
+ "classification": "Public",
+ "flow": "bi-directional",
+ "source": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ ],
+ "destination": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ ]
+ },
+ {
+ "name": "MS-3 to S3",
+ "description": "Data pushed from microservice-3 to S3 bucket",
+ "classification": "Public",
+ "flow": "outbound",
+ "destination": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#s3-example.amazon.com"
+ ]
+ }
+ ],
+ "externalReferences": [
+ {
+ "type": "documentation",
+ "url": "https://ms-3.example.com/swagger"
+ }
+ ]
+ },
+ {
+ "bom-ref": "ms-1-pgsql.example.com",
+ "group": "org.postgresql",
+ "name": "Postgres",
+ "version": "14.1",
+ "description": "Postgres database for Microservice #1",
+ "endpoints": [
+ "https://ms-1-pgsql.example.com:5432"
+ ],
+ "authenticated": true,
+ "trustZone": "Acme Private Zone",
+ "data": [
+ {
+ "name": "MS-1 to Database",
+ "description": "Traffic to/from microservice-1 to database",
+ "classification": "PII",
+ "flow": "bi-directional",
+ "source": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com"
+ ],
+ "destination": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com"
+ ]
+ }
+ ]
+ },
+ {
+ "bom-ref": "s3-example.amazon.com",
+ "group": "com.amazon",
+ "name": "S3",
+ "description": "S3 bucket",
+ "endpoints": [
+ "https://s3-example.amazon.com"
+ ],
+ "authenticated": true,
+ "trustZone": "Public Internet",
+ "data": [
+ {
+ "name": "MS-3 to S3",
+ "description": "Data pushed from microservice-3 to S3 bucket",
+ "classification": "PII",
+ "flow": "inbound",
+ "source": [
+ "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-3.example.com"
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "dependencies": [
+ {
+ "ref": "acme-stock-application",
+ "dependsOn": [ "stock-ticker-service" ]
+ },
+ {
+ "ref": "stock-ticker-service",
+ "dependsOn": [
+ "ms-1.example.com",
+ "ms-2.example.com",
+ "ms-3.example.com"
+ ]
+ },
+ {
+ "ref": "ms-1.example.com",
+ "dependsOn": [ "ms-1-pgsql.example.com" ]
+ },
+ {
+ "ref": "ms-2.example.com",
+ "dependsOn": [ ]
+ },
+ {
+ "ref": "ms-3.example.com",
+ "dependsOn": [ "s3-example.amazon.com" ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-saasbom-1.6.textproto b/tools/src/test/resources/1.7/valid-saasbom-1.6.textproto
new file mode 100644
index 00000000..2edfb952
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-saasbom-1.6.textproto
@@ -0,0 +1,237 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ timestamp {
+ seconds: 1610280000
+ nanos: 0
+ }
+ component {
+ type: CLASSIFICATION_APPLICATION
+ bom_ref: "acme-stock-application"
+ name: "Acme SaaSBOM Example"
+ version: "2022-1"
+ }
+}
+services {
+ bom_ref: "stock-ticker-service"
+ provider {
+ name: "Acme Inc"
+ url: "https://example.com"
+ }
+ group: "com.example"
+ name: "Stock Ticker Service"
+ version:"2022-1"
+ endpoints: "https://example.com/"
+ endpoints: "https://example.com/app"
+ authenticated: true
+ trustZone: "Acme Public Zone"
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "Customer"
+ name: "Consumer to Stock Service",
+ description: "Traffic to/from consumer to service"
+ source: "https://0.0.0.0"
+ destination: "https://0.0.0.0"
+ }
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "PII"
+ name: "Stock Service to MS-1"
+ description: "Traffic to/from stock service to microservice-1"
+ source: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com"
+ destination: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com"
+ }
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "PIFI"
+ name: "Stock Service to MS-2"
+ description: "Traffic to/from stock service to microservice-2"
+ source: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-2.example.com"
+ destination: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-2.example.com"
+ }
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "Public"
+ name: "Stock Service to MS-3"
+ description: "Traffic to/from stock service to microservice-3"
+ source: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-3.example.com"
+ destination: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-3.example.com"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DOCUMENTATION
+ url: "https://example.com/app/swagger"
+ }
+ services {
+ bom_ref: "ms-1.example.com"
+ provider {
+ name: "Acme Inc"
+ url: "https://example.com"
+ }
+ group: "com.example"
+ name: "Microservice 1"
+ version:"2022-1"
+ description: "Example Microservice"
+ endpoints: "https://ms-1.example.com"
+ authenticated: true
+ trustZone: "Acme Private Zone"
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "PII"
+ name: "Stock Service to MS-1"
+ description: "Traffic to/from stock service to microservice-1"
+ governance: {
+ owners: [
+ {
+ organization: {
+ name: "Customer Name"
+ }
+ }
+ ]
+ }
+ source: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ destination: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ }
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "PII"
+ name: "MS-1 to Database"
+ description: "Traffic to/from microservice-1 to database"
+ source: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1-pgsql.example.com"
+ destination: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1-pgsql.example.com"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DOCUMENTATION
+ url: "https://ms-1.example.com/swagger"
+ }
+ }
+ services {
+ bom_ref: "ms-2.example.com"
+ provider {
+ name: "Acme Inc"
+ url: "https://example.com"
+ }
+ group: "com.example"
+ name: "Microservice 2"
+ version:"2022-1"
+ description: "Example Microservice"
+ endpoints: "https://ms-2.example.com"
+ authenticated: true
+ trustZone: "Acme Private Zone"
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "PIFI"
+ name: "Stock Service to MS-2"
+ description: "Traffic to/from stock service to microservice-2"
+ source: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ destination: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DOCUMENTATION
+ url: "https://ms-2.example.com/swagger"
+ }
+ }
+ services {
+ bom_ref: "ms-3.example.com"
+ provider {
+ name: "Acme Inc"
+ url: "https://example.com"
+ }
+ group: "com.example"
+ name: "Microservice 3"
+ version:"2022-1"
+ description: "Example Microservice"
+ endpoints: "https://ms-3.example.com"
+ authenticated: true
+ trustZone: "Acme Private Zone"
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "Public"
+ name: "Stock Service to MS-3"
+ description: "Traffic to/from stock service to microservice-3"
+ source: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ destination: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
+ }
+ data {
+ flow: DATA_FLOW_OUTBOUND
+ value: "Public"
+ name: "MS-3 to S3"
+ description: "Data pushed from microservice-3 to S3 bucket"
+ destination: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#s3-example.amazon.com"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DOCUMENTATION
+ url: "https://ms-3.example.com/swagger"
+ }
+ }
+ services {
+ bom_ref: "ms-1-pgsql.example.com"
+ group: "org.postgresql"
+ name: "Postgres"
+ version:"14.1"
+ description: "Postgres database for Microservice #1"
+ endpoints: "https://ms-1-pgsql.example.com:5432"
+ authenticated: true
+ trustZone: "Acme Private Zone"
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "PII"
+ name: "MS-1 to Database"
+ description: "Traffic to/from microservice-1 to database"
+ source: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com"
+ destination: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com"
+ }
+ }
+ services {
+ bom_ref: "s3-example.amazon.com"
+ group: "com.amazon"
+ name: "S3"
+ description: "S3 bucket"
+ endpoints: "https://s3-example.amazon.com"
+ authenticated: true
+ trustZone: "Public Internet"
+ data {
+ flow: DATA_FLOW_INBOUND
+ value: "PII"
+ name: "MS-3 to S3"
+ description: "Data pushed from microservice-3 to S3 bucket"
+ source: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-3.example.com"
+ }
+ }
+}
+dependencies {
+ ref: "acme-stock-application"
+ dependencies {
+ ref: "stock-ticker-service"
+ }
+}
+dependencies {
+ ref: "stock-ticker-service"
+ dependencies {
+ ref: "ms-1.example.com"
+ }
+ dependencies {
+ ref: "ms-2.example.com"
+ }
+ dependencies {
+ ref: "ms-3.example.com"
+ }
+}
+dependencies {
+ ref: "ms-1.example.com",
+ dependencies {
+ ref: "ms-1-pgsql.example.com"
+ }
+}
+dependencies {
+ ref: "ms-2.example.com",
+}
+dependencies {
+ ref: "ms-3.example.com",
+ dependencies {
+ ref: "s3-example.amazon.com"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-saasbom-1.6.xml b/tools/src/test/resources/1.7/valid-saasbom-1.6.xml
new file mode 100644
index 00000000..433cf3d9
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-saasbom-1.6.xml
@@ -0,0 +1,246 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <metadata>
+ <timestamp>2021-01-10T12:00:00Z</timestamp>
+ <component type="application" bom-ref="acme-stock-application">
+ <name>Acme SaaSBOM Example</name>
+ <version>2022-1</version>
+ </component>
+ </metadata>
+ <services>
+ <service bom-ref="stock-ticker-service">
+ <provider>
+ <name>Acme Inc</name>
+ <url>https://example.com</url>
+ </provider>
+ <group>com.example</group>
+ <name>Stock Ticker Service</name>
+ <version>2022-1</version>
+ <endpoints>
+ <endpoint>https://example.com/</endpoint>
+ <endpoint>https://example.com/app</endpoint>
+ </endpoints>
+ <authenticated>true</authenticated>
+ <trustZone>Acme Public Zone</trustZone>
+ <data>
+ <dataflow name="Consumer to Stock Service" description="Traffic to/from consumer to service">
+ <classification flow="bi-directional">Customer</classification>
+ <source>
+ <url>https://0.0.0.0</url>
+ </source>
+ <destination>
+ <url>https://0.0.0.0</url>
+ </destination>
+ </dataflow>
+ <dataflow name="Stock Service to MS-1" description="Traffic to/from stock service to microservice-1">
+ <classification flow="bi-directional">PII</classification>
+ <source>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com</url>
+ </source>
+ <destination>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com</url>
+ </destination>
+ </dataflow>
+ <dataflow name="Stock Service to MS-2" description="Traffic to/from stock service to microservice-2">
+ <classification flow="bi-directional">PIFI</classification>
+ <source>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-2.example.com</url>
+ </source>
+ <destination>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-2.example.com</url>
+ </destination>
+ </dataflow>
+ <dataflow name="Stock Service to MS-3" description="Traffic to/from stock service to microservice-3">
+ <classification flow="bi-directional">Public</classification>
+ <source>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-3.example.com</url>
+ </source>
+ <destination>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-3.example.com</url>
+ </destination>
+ </dataflow>
+ </data>
+ <externalReferences>
+ <reference type="documentation">
+ <url>https://example.com/app/swagger</url>
+ </reference>
+ </externalReferences>
+ <services>
+ <service bom-ref="ms-1.example.com">
+ <provider>
+ <name>Acme Inc</name>
+ <url>https://example.com</url>
+ </provider>
+ <group>com.example</group>
+ <name>Microservice 1</name>
+ <version>2022-1</version>
+ <description>Example Microservice</description>
+ <endpoints>
+ <endpoint>https://ms-1.example.com</endpoint>
+ </endpoints>
+ <authenticated>true</authenticated>
+ <trustZone>Acme Private Zone</trustZone>
+ <data>
+ <dataflow name="Stock Service to MS-1" description="Traffic to/from stock service to microservice-1">
+ <classification flow="bi-directional">PII</classification>
+ <governance>
+ <owners>
+ <owner>
+ <organization>
+ <name>Customer Name</name>
+ </organization>
+ </owner>
+ </owners>
+ </governance>
+ <source>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service</url>
+ </source>
+ <destination>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service</url>
+ </destination>
+ </dataflow>
+ <dataflow name="MS-1 to Database" description="Traffic to/from microservice-1 to database">
+ <classification flow="bi-directional">PII</classification>
+ <source>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1-pgsql.example.com</url>
+ </source>
+ <destination>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1-pgsql.example.com</url>
+ </destination>
+ </dataflow>
+ </data>
+ <externalReferences>
+ <reference type="documentation">
+ <url>https://ms-1.example.com/swagger</url>
+ </reference>
+ </externalReferences>
+ </service>
+ <service bom-ref="ms-2.example.com">
+ <provider>
+ <name>Acme Inc</name>
+ <url>https://example.com</url>
+ </provider>
+ <group>com.example</group>
+ <name>Microservice 2</name>
+ <version>2022-1</version>
+ <description>Example Microservice</description>
+ <endpoints>
+ <endpoint>https://ms-2.example.com</endpoint>
+ </endpoints>
+ <authenticated>true</authenticated>
+ <trustZone>Acme Private Zone</trustZone>
+ <data>
+ <dataflow name="Stock Service to MS-2" description="Traffic to/from stock service to microservice-2">
+ <classification flow="bi-directional">PIFI</classification>
+ <source>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service</url>
+ </source>
+ <destination>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service</url>
+ </destination>
+ </dataflow>
+ </data>
+ <externalReferences>
+ <reference type="documentation">
+ <url>https://ms-2.example.com/swagger</url>
+ </reference>
+ </externalReferences>
+ </service>
+ <service bom-ref="ms-3.example.com">
+ <provider>
+ <name>Acme Inc</name>
+ <url>https://example.com</url>
+ </provider>
+ <group>com.example</group>
+ <name>Microservice 3</name>
+ <version>2022-1</version>
+ <description>Example Microservice</description>
+ <endpoints>
+ <endpoint>https://ms-3.example.com</endpoint>
+ </endpoints>
+ <authenticated>true</authenticated>
+ <trustZone>Acme Private Zone</trustZone>
+ <data>
+ <dataflow name="Stock Service to MS-3" description="Traffic to/from stock service to microservice-3">
+ <classification flow="bi-directional">Public</classification>
+ <source>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service</url>
+ </source>
+ <destination>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service</url>
+ </destination>
+ </dataflow>
+ <dataflow name="MS-3 to S3" description="Data pushed from microservice-3 to S3 bucket">
+ <classification flow="outbound">Public</classification>
+ <destination>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#s3-example.amazon.com</url>
+ </destination>
+ </dataflow>
+ </data>
+ <externalReferences>
+ <reference type="documentation">
+ <url>https://ms-3.example.com/swagger</url>
+ </reference>
+ </externalReferences>
+ </service>
+ <service bom-ref="ms-1-pgsql.example.com">
+ <group>org.postgresql</group>
+ <name>Postgres</name>
+ <version>14.1</version>
+ <description>Postgres database for Microservice #1</description>
+ <endpoints>
+ <endpoint>https://ms-1-pgsql.example.com:5432</endpoint>
+ </endpoints>
+ <authenticated>true</authenticated>
+ <trustZone>Acme Private Zone</trustZone>
+ <data>
+ <dataflow name="MS-1 to Database" description="Traffic to/from microservice-1 to database">
+ <classification flow="bi-directional">PII</classification>
+ <source>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com</url>
+ </source>
+ <destination>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-1.example.com</url>
+ </destination>
+ </dataflow>
+ </data>
+ </service>
+ <service bom-ref="s3-example.amazon.com">
+ <group>com.amazon</group>
+ <name>S3</name>
+ <description>S3 bucket</description>
+ <endpoints>
+ <endpoint>https://s3-example.amazon.com</endpoint>
+ </endpoints>
+ <authenticated>true</authenticated>
+ <trustZone>Public Internet</trustZone>
+ <data>
+ <dataflow name="MS-3 to S3" description="Data pushed from microservice-3 to S3 bucket">
+ <classification flow="inbound">PII</classification>
+ <source>
+ <url>urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#ms-3.example.com</url>
+ </source>
+ </dataflow>
+ </data>
+ </service>
+ </services>
+ </service>
+ </services>
+ <dependencies>
+ <dependency ref="acme-stock-application">
+ <dependency ref="stock-ticker-service"/>
+ </dependency>
+ <dependency ref="stock-ticker-service">
+ <dependency ref="ms-1.example.com"/>
+ <dependency ref="ms-2.example.com"/>
+ <dependency ref="ms-3.example.com"/>
+ </dependency>
+ <dependency ref="ms-1.example.com">
+ <dependency ref="ms-1-pgsql.example.com"/>
+ </dependency>
+ <dependency ref="ms-2.example.com" />
+ <dependency ref="ms-3.example.com">
+ <dependency ref="s3-example.amazon.com"/>
+ </dependency>
+ </dependencies>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-service-1.6.json b/tools/src/test/resources/1.7/valid-service-1.6.json
new file mode 100644
index 00000000..f5dc557d
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-service-1.6.json
@@ -0,0 +1,102 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "bom-ref": "pkg:maven/com.acme/stock-java-client@1.0.12",
+ "type": "library",
+ "publisher": "Acme Inc",
+ "group": "com.acme",
+ "name": "stock-java-client",
+ "version": "1.0.12",
+ "hashes": [
+ {
+ "alg": "SHA-1",
+ "content": "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ }
+ ],
+ "licenses": [
+ {
+ "license": {
+ "id": "Apache-2.0"
+ }
+ }
+ ],
+ "purl": "pkg:maven/com.acme/stock-java-client@1.0.12"
+ }
+ ],
+ "services": [
+ {
+ "bom-ref": "b2a46a4b-8367-4bae-9820-95557cfe03a8",
+ "provider": {
+ "name": "Partner Org",
+ "url": [
+ "https://partner.org"
+ ],
+ "contact": [
+ {
+ "name": "Support",
+ "email": "support@partner.org",
+ "phone": "800-555-1212"
+ }
+ ]
+ },
+ "group": "org.partner",
+ "name": "Stock ticker service",
+ "version": "2020-Q2",
+ "description": "Provides real-time stock information",
+ "endpoints": [
+ "https://partner.org/api/v1/lookup",
+ "https://partner.org/api/v1/stock"
+ ],
+ "authenticated": true,
+ "x-trust-boundary": true,
+ "data": [
+ {
+ "classification": "PII",
+ "flow": "inbound"
+ },
+ {
+ "classification": "PIFI",
+ "flow": "outbound"
+ },
+ {
+ "classification": "public",
+ "flow": "bi-directional"
+ },
+ {
+ "classification": "partner-data",
+ "flow": "unknown"
+ }
+ ],
+ "licenses": [
+ {
+ "license": {
+ "name": "Partner license"
+ }
+ }
+ ],
+ "externalReferences": [
+ {
+ "type": "website",
+ "url": "http://partner.org"
+ },
+ {
+ "type": "documentation",
+ "url": "http://api.partner.org/swagger"
+ }
+ ]
+ }
+ ],
+ "dependencies": [
+ {
+ "ref": "pkg:maven/com.acme/stock-java-client@1.0.12",
+ "dependsOn": [
+ "b2a46a4b-8367-4bae-9820-95557cfe03a8"
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-service-1.6.textproto b/tools/src/test/resources/1.7/valid-service-1.6.textproto
new file mode 100644
index 00000000..c43ac697
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-service-1.6.textproto
@@ -0,0 +1,79 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "pkg:maven/com.acme/stock-java-client@1.0.12"
+ publisher: "Acme Inc"
+ group: "com.acme"
+ name: "stock-java-client"
+ version: "1.0.12"
+ hashes {
+ alg: HASH_ALG_SHA_1
+ value: "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a"
+ }
+ licenses {
+ license {
+ id: "Apache-2.0"
+ }
+ }
+ purl: "pkg:maven/com.acme/stock-java-client@1.0.12"
+}
+services {
+ bom_ref: "b2a46a4b-8367-4bae-9820-95557cfe03a8"
+ provider {
+ name: "Partner Org"
+ url: "https://partner.org"
+ contact {
+ name: "Support"
+ email: "support@partner.org"
+ phone: "800-555-1212"
+ }
+ }
+ group: "org.partner"
+ name: "Stock ticker service"
+ version: "2020-Q2"
+ description: "Provides real-time stock information"
+ endpoints: "https://partner.org/api/v1/lookup"
+ endpoints: "https://partner.org/api/v1/stock"
+ authenticated: true
+ x_trust_boundary: true
+ data {
+ flow: DATA_FLOW_INBOUND
+ value: "PII"
+ }
+ data {
+ flow: DATA_FLOW_OUTBOUND
+ value: "PIFI"
+ }
+ data {
+ flow: DATA_FLOW_BI_DIRECTIONAL
+ value: "public"
+ }
+ data {
+ flow: DATA_FLOW_UNKNOWN
+ value: "partner-data"
+ }
+ licenses {
+ license {
+ name: "Partner license"
+ }
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_WEBSITE
+ url: "http://partner.org"
+ }
+ external_references {
+ type: EXTERNAL_REFERENCE_TYPE_DOCUMENTATION
+ url: "http://api.partner.org/swagger"
+ }
+}
+dependencies {
+ ref: "pkg:maven/com.acme/stock-java-client@1.0.12"
+ dependencies {
+ ref: "b2a46a4b-8367-4bae-9820-95557cfe03a8"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-service-1.6.xml b/tools/src/test/resources/1.7/valid-service-1.6.xml
new file mode 100644
index 00000000..643effae
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-service-1.6.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library" bom-ref="pkg:maven/com.acme/stock-java-client@1.0.12">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>stock-java-client</name>
+ <version>1.0.12</version>
+ <hashes>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/stock-java-client@1.0.12</purl>
+ </component>
+ </components>
+ <services>
+ <service bom-ref="b2a46a4b-8367-4bae-9820-95557cfe03a8">
+ <provider>
+ <name>Partner Org</name>
+ <url>https://partner.org</url>
+ <contact>
+ <name>Support</name>
+ <email>support@partner.org</email>
+ <phone>800-555-1212</phone>
+ </contact>
+ </provider>
+ <group>org.partner</group>
+ <name>Stock ticker service</name>
+ <version>2020-Q2</version>
+ <description>Provides real-time stock information</description>
+ <endpoints>
+ <endpoint>https://partner.org/api/v1/lookup</endpoint>
+ <endpoint>https://partner.org/api/v1/stock</endpoint>
+ </endpoints>
+ <authenticated>true</authenticated>
+ <x-trust-boundary>true</x-trust-boundary>
+ <data>
+ <classification flow="inbound">PII</classification>
+ <classification flow="outbound">PIFI</classification>
+ <classification flow="bi-directional">public</classification>
+ <classification flow="unknown">partner-data</classification>
+ </data>
+ <licenses>
+ <license>
+ <name>Partner license</name>
+ </license>
+ </licenses>
+ <externalReferences>
+ <reference type="website">
+ <url>http://partner.org</url>
+ </reference>
+ <reference type="documentation">
+ <url>http://api.partner.org/swagger</url>
+ </reference>
+ </externalReferences>
+ </service>
+ </services>
+ <dependencies>
+ <dependency ref="pkg:maven/com.acme/stock-java-client@1.0.12">
+ <dependency ref="b2a46a4b-8367-4bae-9820-95557cfe03a8"/>
+ </dependency>
+ </dependencies>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.json b/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.json
new file mode 100644
index 00000000..7338836d
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.json
@@ -0,0 +1,23 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "services": [
+ {
+ "bom-ref": "b2a46a4b-8367-4bae-9820-95557cfe03a8",
+ "provider": {
+ "contact": [
+ ]
+ },
+ "name": "Stock ticker service",
+ "endpoints": [
+ ],
+ "data": [
+ ],
+ "externalReferences": [
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.textproto b/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.textproto
new file mode 100644
index 00000000..1b20a319
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.textproto
@@ -0,0 +1,12 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+services {
+ bom_ref: "b2a46a4b-8367-4bae-9820-95557cfe03a8"
+ provider {
+ }
+ name: "Stock ticker service"
+}
diff --git a/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.xml b/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.xml
new file mode 100644
index 00000000..38023db3
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <services>
+ <service bom-ref="b2a46a4b-8367-4bae-9820-95557cfe03a8">
+ <provider>
+ </provider>
+ <name>Stock ticker service</name>
+ <endpoints>
+ </endpoints>
+ <data>
+ </data>
+ <licenses>
+ </licenses>
+ </service>
+ </services>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-signatures-1.6.json b/tools/src/test/resources/1.7/valid-signatures-1.6.json
new file mode 100644
index 00000000..5542c90e
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-signatures-1.6.json
@@ -0,0 +1,79 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "bom-ref": "5366293e-0740-4dcf-b1d0-0c1fc26e4981",
+ "type": "application",
+ "name": "amce app",
+ "version": "1.0",
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [
+ "MIIB-TCCAVigAwIBAgIGAWFcc4YkMAwGCCqGSM49BAMEBQAwLTELMAkGA1UEBhMCRVUxHjAcBgNVBAMTFVRydXN0IE5ldHdvcmsgU3ViIENBMzAeFw0xODAxMDEwMDAwMDBaFw0yMjEyMzEyMzU5NTlaMDIxCzAJBgNVBAYTAkZSMQ0wCwYDVQQFEwQ0NTAxMRQwEgYDVQQDEwtleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABHHp7A83DBJIInj8-g1we3A7sBXprIQBUfdFDVUBQoPExq8rze6ewG0-eVcSF72J77gKiD0IHnzpwHaU7t6nVeajXTBbMAkGA1UdEwQCMAAwDgYDVR0PAQH_BAQDAgP4MB0GA1UdDgQWBBQQyJ9rXSIskoUuA946von62LoxqzAfBgNVHSMEGDAWgBTUWrS54qC2NgG3UK6rVAr0gbQ0MTAMBggqhkjOPQQDBAUAA4GMADCBiAJCAaWoVQ0r6jFjhO5e0WJTgyMmA8BhpO1t7gXQ6xoKGso9jCOYf9OG9BFfZoVmdIyfYiwkhy1ld27tiOJ5X4m6WasRAkIBpEkUDf8irbSZ1V7zXALaR2mJTjKQV_5jRHsiBQWA-5DxEa-x_zJVRz8tpp-jjT2tSCU82bwUOBLu6te1YIDpWCA",
+ "MIIDsTCCAZmgAwIBAgIBAzANBgkqhkiG9w0BAQ0FADAuMQswCQYDVQQGEwJVUzEfMB0GA1UEAxMWVHJ1c3QgTmV0d29yayBSb290IENBMTAeFw0xNjA3MTAxMDAwMDBaFw0yNTA3MTAwOTU5NTlaMC0xCzAJBgNVBAYTAkVVMR4wHAYDVQQDExVUcnVzdCBOZXR3b3JrIFN1YiBDQTMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAGJzPZsjniwyZeXrgrlQM3Y13r3znR8FSQpKbC2bplrOWySQJPGm-GFObe5Dk4t3Jrtk_Pbs8-3VW_4q5drL0YqYwBYNJPhqjbSM6SGHrc6wNdPZRw_WnJVa0ELXKICC73lkjskWPfE-cLpZ3sTq1ovEmoNjgaySVRUH1wFDdkqyReJaKNjMGEwDwYDVR0TAQH_BAUwAwEB_zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNRatLnioLY2AbdQrqtUCvSBtDQxMB8GA1UdIwQYMBaAFEkmC1HDAh0fXehpiUhUGE868Hk2MA0GCSqGSIb3DQEBDQUAA4ICAQAs2KADYyGQCVy8tJZWakNtGdww4OumZpBuR66p_2xK7veRubQEhG-nJn7oVkJ4w5pEec3sYQEqtPbHyZcEKEYbOJ2cVf1nMH-DvFZ6ypQocGRp3WSWsTzL3SgqiWrQdPX1Y5dO6Hvx7p9ST9H2WgkxB-Q75Jov1gVF3bScAbxb7Mw7tf5z3Cvqmfo0Gatkgzz6-jDPrtUK7AAAOw3C0kHMbE3EnNarsfhBkUerE8QVmHIvz373mWt0SnguaHq0A9ZuSia_pF7bgfVRZi2ZzIzpu2O276sB2Yji9tcSn5l21jq63rXtvY_DLAi4kaLyf9sHT_tkH-gkTdkdkfQq8sA5ysRW21wPQbmjTIVwsfY4JjajVIUitjPbkUJqURpf2VD0JXdYQHS6KVPWqHWTlKPlsKbhw4ghuLqCMYda88L9rxWnSC5L8s0DJSuBBm-nq23NtHl5FbCzeXWcKRayIgimT-An1WIOeJP4F7-BctYLIooKoQzJZR1tOWvprUs22_xAivVBz7J_LmJyVlKesB2ic8qYdt7YVoCsWrnEUgoNoJPwLHeva8KPvd0gLXrwaMyTCCjeoemXFj6nCbbMHJeVffh6jYBAzlbcAEvTiZcdzrVVr54kOtWskyaeDnAcMXW4Of1vWdUJ2as5nyfletfTp4E6A9P2dZ5g7nMoL90yIw"
+ ],
+ "value": "tqITqIm0gUMWXIjqDgwqzqPw1CwTUKRewZQ5YpX3VwFMWV68NJgX4npU91cSwSC-MRlx1QfOYwSQkeU26VpXSg"
+ }
+ }
+ ],
+ "services": [
+ {
+ "bom-ref": "ee10d0a2-baba-4656-a5ac-d49e172a0d3d",
+ "group": "org.partner",
+ "name": "Stock ticker service",
+ "version": "2020-Q2",
+ "endpoints": [
+ "https://partner.org/api/v1/lookup",
+ "https://partner.org/api/v1/stock"
+ ],
+ "authenticated": true,
+ "x-trust-boundary": true,
+ "data": [
+ {
+ "classification": "PII",
+ "flow": "inbound"
+ }
+ ],
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [
+ "MIIB-TCCAVigAwIBAgIGAWFcc4YkMAwGCCqGSM49BAMEBQAwLTELMAkGA1UEBhMCRVUxHjAcBgNVBAMTFVRydXN0IE5ldHdvcmsgU3ViIENBMzAeFw0xODAxMDEwMDAwMDBaFw0yMjEyMzEyMzU5NTlaMDIxCzAJBgNVBAYTAkZSMQ0wCwYDVQQFEwQ0NTAxMRQwEgYDVQQDEwtleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABHHp7A83DBJIInj8-g1we3A7sBXprIQBUfdFDVUBQoPExq8rze6ewG0-eVcSF72J77gKiD0IHnzpwHaU7t6nVeajXTBbMAkGA1UdEwQCMAAwDgYDVR0PAQH_BAQDAgP4MB0GA1UdDgQWBBQQyJ9rXSIskoUuA946von62LoxqzAfBgNVHSMEGDAWgBTUWrS54qC2NgG3UK6rVAr0gbQ0MTAMBggqhkjOPQQDBAUAA4GMADCBiAJCAaWoVQ0r6jFjhO5e0WJTgyMmA8BhpO1t7gXQ6xoKGso9jCOYf9OG9BFfZoVmdIyfYiwkhy1ld27tiOJ5X4m6WasRAkIBpEkUDf8irbSZ1V7zXALaR2mJTjKQV_5jRHsiBQWA-5DxEa-x_zJVRz8tpp-jjT2tSCU82bwUOBLu6te1YIDpWCA",
+ "MIIDsTCCAZmgAwIBAgIBAzANBgkqhkiG9w0BAQ0FADAuMQswCQYDVQQGEwJVUzEfMB0GA1UEAxMWVHJ1c3QgTmV0d29yayBSb290IENBMTAeFw0xNjA3MTAxMDAwMDBaFw0yNTA3MTAwOTU5NTlaMC0xCzAJBgNVBAYTAkVVMR4wHAYDVQQDExVUcnVzdCBOZXR3b3JrIFN1YiBDQTMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAGJzPZsjniwyZeXrgrlQM3Y13r3znR8FSQpKbC2bplrOWySQJPGm-GFObe5Dk4t3Jrtk_Pbs8-3VW_4q5drL0YqYwBYNJPhqjbSM6SGHrc6wNdPZRw_WnJVa0ELXKICC73lkjskWPfE-cLpZ3sTq1ovEmoNjgaySVRUH1wFDdkqyReJaKNjMGEwDwYDVR0TAQH_BAUwAwEB_zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNRatLnioLY2AbdQrqtUCvSBtDQxMB8GA1UdIwQYMBaAFEkmC1HDAh0fXehpiUhUGE868Hk2MA0GCSqGSIb3DQEBDQUAA4ICAQAs2KADYyGQCVy8tJZWakNtGdww4OumZpBuR66p_2xK7veRubQEhG-nJn7oVkJ4w5pEec3sYQEqtPbHyZcEKEYbOJ2cVf1nMH-DvFZ6ypQocGRp3WSWsTzL3SgqiWrQdPX1Y5dO6Hvx7p9ST9H2WgkxB-Q75Jov1gVF3bScAbxb7Mw7tf5z3Cvqmfo0Gatkgzz6-jDPrtUK7AAAOw3C0kHMbE3EnNarsfhBkUerE8QVmHIvz373mWt0SnguaHq0A9ZuSia_pF7bgfVRZi2ZzIzpu2O276sB2Yji9tcSn5l21jq63rXtvY_DLAi4kaLyf9sHT_tkH-gkTdkdkfQq8sA5ysRW21wPQbmjTIVwsfY4JjajVIUitjPbkUJqURpf2VD0JXdYQHS6KVPWqHWTlKPlsKbhw4ghuLqCMYda88L9rxWnSC5L8s0DJSuBBm-nq23NtHl5FbCzeXWcKRayIgimT-An1WIOeJP4F7-BctYLIooKoQzJZR1tOWvprUs22_xAivVBz7J_LmJyVlKesB2ic8qYdt7YVoCsWrnEUgoNoJPwLHeva8KPvd0gLXrwaMyTCCjeoemXFj6nCbbMHJeVffh6jYBAzlbcAEvTiZcdzrVVr54kOtWskyaeDnAcMXW4Of1vWdUJ2as5nyfletfTp4E6A9P2dZ5g7nMoL90yIw"
+ ],
+ "value": "6A77T3RBTAuVpZOgFFFfOvGOQ1hqMbfSQ91VucRM1RIP6QqX9kEF1Pi1_vCl37qpVzK51kIyppgUF_i9s999XA"
+ }
+ }
+ ],
+ "compositions": [
+ {
+ "aggregate": "complete",
+ "assemblies": [
+ "5366293e-0740-4dcf-b1d0-0c1fc26e4981",
+ "ee10d0a2-baba-4656-a5ac-d49e172a0d3d"
+ ],
+ "dependencies": [
+ "5366293e-0740-4dcf-b1d0-0c1fc26e4981"
+ ],
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [
+ "MIIB-TCCAVigAwIBAgIGAWFcc4YkMAwGCCqGSM49BAMEBQAwLTELMAkGA1UEBhMCRVUxHjAcBgNVBAMTFVRydXN0IE5ldHdvcmsgU3ViIENBMzAeFw0xODAxMDEwMDAwMDBaFw0yMjEyMzEyMzU5NTlaMDIxCzAJBgNVBAYTAkZSMQ0wCwYDVQQFEwQ0NTAxMRQwEgYDVQQDEwtleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABHHp7A83DBJIInj8-g1we3A7sBXprIQBUfdFDVUBQoPExq8rze6ewG0-eVcSF72J77gKiD0IHnzpwHaU7t6nVeajXTBbMAkGA1UdEwQCMAAwDgYDVR0PAQH_BAQDAgP4MB0GA1UdDgQWBBQQyJ9rXSIskoUuA946von62LoxqzAfBgNVHSMEGDAWgBTUWrS54qC2NgG3UK6rVAr0gbQ0MTAMBggqhkjOPQQDBAUAA4GMADCBiAJCAaWoVQ0r6jFjhO5e0WJTgyMmA8BhpO1t7gXQ6xoKGso9jCOYf9OG9BFfZoVmdIyfYiwkhy1ld27tiOJ5X4m6WasRAkIBpEkUDf8irbSZ1V7zXALaR2mJTjKQV_5jRHsiBQWA-5DxEa-x_zJVRz8tpp-jjT2tSCU82bwUOBLu6te1YIDpWCA",
+ "MIIDsTCCAZmgAwIBAgIBAzANBgkqhkiG9w0BAQ0FADAuMQswCQYDVQQGEwJVUzEfMB0GA1UEAxMWVHJ1c3QgTmV0d29yayBSb290IENBMTAeFw0xNjA3MTAxMDAwMDBaFw0yNTA3MTAwOTU5NTlaMC0xCzAJBgNVBAYTAkVVMR4wHAYDVQQDExVUcnVzdCBOZXR3b3JrIFN1YiBDQTMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAGJzPZsjniwyZeXrgrlQM3Y13r3znR8FSQpKbC2bplrOWySQJPGm-GFObe5Dk4t3Jrtk_Pbs8-3VW_4q5drL0YqYwBYNJPhqjbSM6SGHrc6wNdPZRw_WnJVa0ELXKICC73lkjskWPfE-cLpZ3sTq1ovEmoNjgaySVRUH1wFDdkqyReJaKNjMGEwDwYDVR0TAQH_BAUwAwEB_zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNRatLnioLY2AbdQrqtUCvSBtDQxMB8GA1UdIwQYMBaAFEkmC1HDAh0fXehpiUhUGE868Hk2MA0GCSqGSIb3DQEBDQUAA4ICAQAs2KADYyGQCVy8tJZWakNtGdww4OumZpBuR66p_2xK7veRubQEhG-nJn7oVkJ4w5pEec3sYQEqtPbHyZcEKEYbOJ2cVf1nMH-DvFZ6ypQocGRp3WSWsTzL3SgqiWrQdPX1Y5dO6Hvx7p9ST9H2WgkxB-Q75Jov1gVF3bScAbxb7Mw7tf5z3Cvqmfo0Gatkgzz6-jDPrtUK7AAAOw3C0kHMbE3EnNarsfhBkUerE8QVmHIvz373mWt0SnguaHq0A9ZuSia_pF7bgfVRZi2ZzIzpu2O276sB2Yji9tcSn5l21jq63rXtvY_DLAi4kaLyf9sHT_tkH-gkTdkdkfQq8sA5ysRW21wPQbmjTIVwsfY4JjajVIUitjPbkUJqURpf2VD0JXdYQHS6KVPWqHWTlKPlsKbhw4ghuLqCMYda88L9rxWnSC5L8s0DJSuBBm-nq23NtHl5FbCzeXWcKRayIgimT-An1WIOeJP4F7-BctYLIooKoQzJZR1tOWvprUs22_xAivVBz7J_LmJyVlKesB2ic8qYdt7YVoCsWrnEUgoNoJPwLHeva8KPvd0gLXrwaMyTCCjeoemXFj6nCbbMHJeVffh6jYBAzlbcAEvTiZcdzrVVr54kOtWskyaeDnAcMXW4Of1vWdUJ2as5nyfletfTp4E6A9P2dZ5g7nMoL90yIw"
+ ],
+ "value": "lm6wx-elyBTbNMKNF8riooZhvrm6f5j8JpvgP9JtVv50dd7sXQLH7PqJcn9fmKV8eoF8cszPllEsQQhEQOM4hA"
+ }
+ }
+ ],
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [
+ "MIIB-TCCAVigAwIBAgIGAWFcc4YkMAwGCCqGSM49BAMEBQAwLTELMAkGA1UEBhMCRVUxHjAcBgNVBAMTFVRydXN0IE5ldHdvcmsgU3ViIENBMzAeFw0xODAxMDEwMDAwMDBaFw0yMjEyMzEyMzU5NTlaMDIxCzAJBgNVBAYTAkZSMQ0wCwYDVQQFEwQ0NTAxMRQwEgYDVQQDEwtleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABHHp7A83DBJIInj8-g1we3A7sBXprIQBUfdFDVUBQoPExq8rze6ewG0-eVcSF72J77gKiD0IHnzpwHaU7t6nVeajXTBbMAkGA1UdEwQCMAAwDgYDVR0PAQH_BAQDAgP4MB0GA1UdDgQWBBQQyJ9rXSIskoUuA946von62LoxqzAfBgNVHSMEGDAWgBTUWrS54qC2NgG3UK6rVAr0gbQ0MTAMBggqhkjOPQQDBAUAA4GMADCBiAJCAaWoVQ0r6jFjhO5e0WJTgyMmA8BhpO1t7gXQ6xoKGso9jCOYf9OG9BFfZoVmdIyfYiwkhy1ld27tiOJ5X4m6WasRAkIBpEkUDf8irbSZ1V7zXALaR2mJTjKQV_5jRHsiBQWA-5DxEa-x_zJVRz8tpp-jjT2tSCU82bwUOBLu6te1YIDpWCA",
+ "MIIDsTCCAZmgAwIBAgIBAzANBgkqhkiG9w0BAQ0FADAuMQswCQYDVQQGEwJVUzEfMB0GA1UEAxMWVHJ1c3QgTmV0d29yayBSb290IENBMTAeFw0xNjA3MTAxMDAwMDBaFw0yNTA3MTAwOTU5NTlaMC0xCzAJBgNVBAYTAkVVMR4wHAYDVQQDExVUcnVzdCBOZXR3b3JrIFN1YiBDQTMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAGJzPZsjniwyZeXrgrlQM3Y13r3znR8FSQpKbC2bplrOWySQJPGm-GFObe5Dk4t3Jrtk_Pbs8-3VW_4q5drL0YqYwBYNJPhqjbSM6SGHrc6wNdPZRw_WnJVa0ELXKICC73lkjskWPfE-cLpZ3sTq1ovEmoNjgaySVRUH1wFDdkqyReJaKNjMGEwDwYDVR0TAQH_BAUwAwEB_zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNRatLnioLY2AbdQrqtUCvSBtDQxMB8GA1UdIwQYMBaAFEkmC1HDAh0fXehpiUhUGE868Hk2MA0GCSqGSIb3DQEBDQUAA4ICAQAs2KADYyGQCVy8tJZWakNtGdww4OumZpBuR66p_2xK7veRubQEhG-nJn7oVkJ4w5pEec3sYQEqtPbHyZcEKEYbOJ2cVf1nMH-DvFZ6ypQocGRp3WSWsTzL3SgqiWrQdPX1Y5dO6Hvx7p9ST9H2WgkxB-Q75Jov1gVF3bScAbxb7Mw7tf5z3Cvqmfo0Gatkgzz6-jDPrtUK7AAAOw3C0kHMbE3EnNarsfhBkUerE8QVmHIvz373mWt0SnguaHq0A9ZuSia_pF7bgfVRZi2ZzIzpu2O276sB2Yji9tcSn5l21jq63rXtvY_DLAi4kaLyf9sHT_tkH-gkTdkdkfQq8sA5ysRW21wPQbmjTIVwsfY4JjajVIUitjPbkUJqURpf2VD0JXdYQHS6KVPWqHWTlKPlsKbhw4ghuLqCMYda88L9rxWnSC5L8s0DJSuBBm-nq23NtHl5FbCzeXWcKRayIgimT-An1WIOeJP4F7-BctYLIooKoQzJZR1tOWvprUs22_xAivVBz7J_LmJyVlKesB2ic8qYdt7YVoCsWrnEUgoNoJPwLHeva8KPvd0gLXrwaMyTCCjeoemXFj6nCbbMHJeVffh6jYBAzlbcAEvTiZcdzrVVr54kOtWskyaeDnAcMXW4Of1vWdUJ2as5nyfletfTp4E6A9P2dZ5g7nMoL90yIw"
+ ],
+ "value": "m4pMbQQVV61TlP4Og7a75SeY8lh00LkkUDXZ4PIhXsR512MPRgZmusFYorJlYq9wM3P9n9gM3T8BTg9XdFdQkQ"
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-standard-1.6.json b/tools/src/test/resources/1.7/valid-standard-1.6.json
new file mode 100644
index 00000000..3150227b
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-standard-1.6.json
@@ -0,0 +1,79 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "definitions": {
+ "standards": [
+ {
+ "bom-ref": "standard-1",
+ "name": "Sample Standard",
+ "version": "1.0.0",
+ "description": "Description here",
+ "owner": "Acme Inc",
+ "requirements": [
+ {
+ "bom-ref": "requirement-1",
+ "identifier": "v1",
+ "title": "Title here"
+ },
+ {
+ "bom-ref": "requirement-1.1",
+ "identifier": "v1.1",
+ "title": "Title here",
+ "text": "Text here",
+ "descriptions": [
+ "Requirement is described here",
+ "and here"
+ ],
+ "parent": "requirement-1"
+ },
+ {
+ "bom-ref": "requirement-1.1.1",
+ "identifier": "v1.1.1",
+ "text": "Text of the requirement here",
+ "descriptions": [
+ "Supplemental text here"
+ ],
+ "openCre": [
+ "CRE:616-305"
+ ],
+ "parent": "requirement-1.1"
+ }
+ ],
+ "levels": [
+ {
+ "bom-ref": "level-1",
+ "identifier": "Level 1",
+ "description": "Description here",
+ "requirements": [
+ "requirement-1.1.1"
+ ]
+ },
+ {
+ "bom-ref": "level-2",
+ "identifier": "Level 2",
+ "description": "Description here",
+ "requirements": [
+ "requirement-1.1.1"
+ ]
+ },
+ {
+ "bom-ref": "level-3",
+ "identifier": "Level 3",
+ "description": "Description here",
+ "requirements": [
+ "requirement-1.1.1"
+ ]
+ }
+ ],
+ "signature": {
+ "algorithm": "ES256",
+ "certificatePath": [ "MIIB...", "MIID..." ],
+ "value": "tqIT..."
+ }
+ }
+ ]
+ }
+}
diff --git a/tools/src/test/resources/1.7/valid-standard-1.6.textproto b/tools/src/test/resources/1.7/valid-standard-1.6.textproto
new file mode 100644
index 00000000..3388c5cd
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-standard-1.6.textproto
@@ -0,0 +1,73 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6",
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+definitions {
+ standards: [
+ {
+ bom_ref: "standard-1"
+ name: "Sample Standard"
+ version: "1.0.0"
+ description: "Description here"
+ owner: "Acme Inc"
+ requirements: [
+ {
+ bom_ref: "requirement-1"
+ identifier: "v1"
+ title: "Title here"
+ },
+ {
+ bom_ref: "requirement-1.1"
+ identifier: "v1.1"
+ title: "Title here"
+ text: "Text here"
+ descriptions: [
+ "Requirement is described here",
+ "and here"
+ ]
+ parent: "requirement-1"
+ },
+ {
+ bom_ref: "requirement-1.1.1"
+ identifier: "v1.1.1"
+ text: "Text of the requirement here"
+ descriptions: [
+ "Supplemental text here"
+ ]
+ openCre: [
+ "CRE:616-305"
+ ],
+ parent: "requirement-1.1"
+ }
+ ]
+ levels: [
+ {
+ bom_ref: "level-1"
+ identifier: "Level 1"
+ description: "Description here"
+ requirements: [
+ "requirement-1.1.1"
+ ]
+ },
+ {
+ bom_ref: "level-2"
+ identifier: "Level 2"
+ description: "Description here"
+ requirements: [
+ "requirement-1.1.1"
+ ]
+ },
+ {
+ bom_ref: "level-3"
+ identifier: "Level 3"
+ description: "Description here"
+ requirements: [
+ "requirement-1.1.1"
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/valid-standard-1.6.xml b/tools/src/test/resources/1.7/valid-standard-1.6.xml
new file mode 100644
index 00000000..cdf5c037
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-standard-1.6.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <definitions>
+ <standards>
+ <standard bom-ref="standard-1">
+ <name>Sample Standard</name>
+ <version>1.0.0</version>
+ <description>Description here</description>
+ <owner>Acme Inc</owner>
+ <requirements>
+ <requirement bom-ref="requirement-1">
+ <identifier>v1</identifier>
+ <title>Title here</title>
+ </requirement>
+ <requirement bom-ref="requirement-1.1">
+ <identifier>v1.1</identifier>
+ <title>Title here</title>
+ <text>Text here</text>
+ <descriptions>
+ <description>Requirement is described here</description>
+ <description>and here</description>
+ </descriptions>
+ <parent>requirement-1</parent>
+ </requirement>
+ <requirement bom-ref="requirement-1.1.1">
+ <identifier>v1.1.1</identifier>
+ <text>Text of the requirement here</text>
+ <descriptions>
+ <description>Supplemental text here</description>
+ </descriptions>
+ <openCre>CRE:616-305</openCre>
+ <parent>requirement-1.1</parent>
+ </requirement>
+ </requirements>
+ <levels>
+ <level bom-ref="level-1">
+ <identifier>Level 1</identifier>
+ <description>Description here</description>
+ <requirements>
+ <requirement>requirement-1.1.1</requirement>
+ </requirements>
+ </level>
+ <level bom-ref="level-2">
+ <identifier>Level 2</identifier>
+ <description>Description here</description>
+ <requirements>
+ <requirement>requirement-1.1.1</requirement>
+ </requirements>
+ </level>
+ <level bom-ref="level-3">
+ <identifier>Level 3</identifier>
+ <description>Description here</description>
+ <requirements>
+ <requirement>requirement-1.1.1</requirement>
+ </requirements>
+ </level>
+ </levels>
+ <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <!-- XML signature here -->
+ </ds:Signature>
+ </standard>
+ </standards>
+ </definitions>
+</bom>
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/valid-tags-1.6.json b/tools/src/test/resources/1.7/valid-tags-1.6.json
new file mode 100644
index 00000000..1052997b
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-tags-1.6.json
@@ -0,0 +1,22 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "my-json-parser",
+ "version": "1.0",
+ "tags": [ "json-parser", "javascript", "node.js" ]
+ }
+ ],
+ "services": [
+ {
+ "name": "my service",
+ "endpoints": [ "https://example.com/myservice" ],
+ "tags": [ "microservice", "golang", "aws", "us-east-1" ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-tags-1.6.textproto b/tools/src/test/resources/1.7/valid-tags-1.6.textproto
new file mode 100644
index 00000000..a2df47d6
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-tags-1.6.textproto
@@ -0,0 +1,17 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "my-json-parser"
+ version: "1.0"
+ tags: [ "json-parser", "javascript", "node.js" ]
+}
+services {
+ name: "my service"
+ endpoints: [ "https://example.com/myservice" ]
+ tags: [ "microservice", "golang", "aws", "us-east-1" ]
+}
diff --git a/tools/src/test/resources/1.7/valid-tags-1.6.xml b/tools/src/test/resources/1.7/valid-tags-1.6.xml
new file mode 100644
index 00000000..49497a1c
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-tags-1.6.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library">
+ <name>my-json-parser</name>
+ <version>1.0</version>
+ <tags>
+ <tag>json-parser</tag>
+ <tag>javascript</tag>
+ <tag>node.js</tag>
+ </tags>
+ </component>
+ </components>
+ <services>
+ <service>
+ <name>my service</name>
+ <endpoints>
+ <endpoint>https://example.com/myservice</endpoint>
+ </endpoints>
+ <tags>
+ <tag>microservice</tag>
+ <tag>golang</tag>
+ <tag>aws</tag>
+ <tag>us-east-1</tag>
+ </tags>
+ </service>
+ </services>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-vulnerability-1.6.json b/tools/src/test/resources/1.7/valid-vulnerability-1.6.json
new file mode 100644
index 00000000..52bb70f1
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-vulnerability-1.6.json
@@ -0,0 +1,170 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.6",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "bom-ref": "pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.9.4",
+ "type": "library",
+ "group": "com.fasterxml.jackson.core",
+ "name": "jackson-databind",
+ "version": "2.9.4",
+ "purl": "pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.9.4"
+ }
+ ],
+ "vulnerabilities": [
+ {
+ "bom-ref": "6eee14da-8f42-4cc4-bb65-203235f02415",
+ "id": "SNYK-JAVA-COMFASTERXMLJACKSONCORE-32111",
+ "source": {
+ "name": "Snyk",
+ "url": "https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-32111"
+ },
+ "references": [
+ {
+ "id": "CVE-2018-7489",
+ "source": {
+ "name": "NVD",
+ "url": "https://nvd.nist.gov/vuln/detail/CVE-2019-9997"
+ }
+ }
+ ],
+ "ratings": [
+ {
+ "source": {
+ "name": "NVD",
+ "url": "https://nvd.nist.gov/vuln-metrics/cvss/v3-calculator?vector=AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H&version=3.0"
+ },
+ "score": 9.8,
+ "severity": "critical",
+ "method": "CVSSv3",
+ "vector": "AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H",
+ "justification": "An optional reason for rating the vulnerability as it was"
+ }
+ ],
+ "cwes": [
+ 184,
+ 502
+ ],
+ "description": "FasterXML jackson-databind before 2.7.9.3, 2.8.x before 2.8.11.1 and 2.9.x before 2.9.5 allows unauthenticated remote code execution because of an incomplete fix for the CVE-2017-7525 deserialization flaw. This is exploitable by sending maliciously crafted JSON input to the readValue method of the ObjectMapper, bypassing a blacklist that is ineffective if the c3p0 libraries are available in the classpath.",
+ "detail": "",
+ "recommendation": "Upgrade com.fasterxml.jackson.core:jackson-databind to version 2.6.7.5, 2.8.11.1, 2.9.5 or higher.",
+ "workaround": "Describe the workarounds here",
+ "proofOfConcept": {
+ "reproductionSteps": "Precise steps to reproduce go here",
+ "environment": "Describe the environment",
+ "supportingMaterial": [
+ {
+ "contentType": "image/jpeg",
+ "encoding": "base64",
+ "content": "/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAABQKADAAQAAAABAAABQAAAAAD/wAARCAFAAUADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9sAQwACAgICAgIDAgIDBQMDAwUGBQUFBQYIBgYGBgYICggICAgICAoKCgoKCgoKDAwMDAwMDg4ODg4PDw8PDw8PDw8P/9sAQwECAgIEBAQHBAQHEAsJCxAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQ/90ABAAU/9oADAMBAAIRAxEAPwD9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9D9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9H9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9L9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9P9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9T9xKKKKACiiigAooooAKKKKACiiigAooooAKKzdY1jSfD2lXWua7eRafp9jG0s9xO4SONF6szHgCvyK+P/APwUJ1zV7i68MfAxTpmnKTG2sTJ/pU3Ym3jbIiU9mYFz1AWmkB+qvjL4ieA/h5Z/bvHPiCy0OEjK/a51jZv91CdzfgDXy3r/APwUA/Zw0WVobPUr/WWXvZ2T7D9GmMQNfitofhT4ofGXX5ptHsdR8V6rK2Zrht85BPeSaQ7V/wCBMK+nvDv7Afxk1WJZtcvtL0PdzskmeeQfUQqVz/wI185nXF+VZc+XG4mMH2b1+5Xf4HTRwlWprCLZ9xW//BSD4DSy7JtO12Bf77WsBH5LOT+leweEP2yv2cfGc0drZeL4tNuJOBHqUclmST23yKI//H6/Om4/4J2eOli3Wvi/TJJP7rwzoPzAb+VeL+NP2NPjx4Ohku00aPXrWPJL6ZKJ2x/1yYLIfwU15WX+JeQYqfs6OMhfzfL/AOlJGk8trxV3Bn9Ctpd2t/bR3thPHc28w3JLEweNwe6spII+lWK/me+G3xr+LfwN1hj4P1e50zyXxcadcBmtnI6rLbScA+4CsOxr9mP2bv2x/Bfxz8rwzrUaeHfGIX/jzd8wXeBy1q7ck9zG3zDtuGTX2+6ujiPsmiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD//1f3EooooAKKKKACiiigAooooAKKKKACop54LWCS6upFhhhVnkdyFVEUZZmJ4AAGSalr88P8AgoV8aJ/BXgCz+F+hXBi1PxeGa7ZDho9OiOGX285/k91DChAfDv7Xn7Uuo/GzxHN4V8LXL2/gbSZSIUUlft8qHH2mUd1z/qlP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Behf9qCQ4Y/7jtn0r45v9L8e/DXVtmo2upeFtSjPV1ms5c+x+Un8DX9S1UdT0vS9atWsdasoNQtm4MVxEsyEf7rgiiSUk4yV0xp2P5zPD/7Vf7QHhxUSz8ZXV1EvRLxY7sfnKrN+terad+3x8crQBb2HSb8Du9q0bH8Y5FH6V+sniP8AZO/Z08UO8upeBNPhlfkvaB7Rs+v7hkH6V5Fqf/BPP9nS+YtZwarp2f8AnjfFgPoJVevlMbwHkmId62Dpt9+VJ/ekmdUMdWjtN/efEEP/AAUP+JiDE3hfR5D6g3C/+1KfL/wUQ+JLLiLwto6H1LXDf+1BX1fP/wAE1vgw7E2/iDXYh6NLbP8A+0RUcP8AwTU+DitmfxFrkg9A9uv6+Sa8n/iFHDl7/U4/fL/M1/tXEfznxVqf7fPxwvAVsINJ04Hulq0jD8ZJGH6V474m/ae+PPipHi1TxleQQv1jtClomD2/cqhx+NfrLpf/AATw/Z2sGDXseraljtPfbAfqIUjr2Xwz+yp+zx4SdJtJ8CadJMnIku0a8fPrm4aQfpXr4DgTJMM+ahg6afflTf3u7MZ46tL4pv7z+fPw34J+IfxN1Qx+F9G1HxJfTH5nhikuDk93lOQPqzV93fCr/gnH49154dS+K+qReGrE4ZrO1K3N6w9Cw/dR/XLn2r9l7Ozs9OtlstOt47S3ThYoUWNAPZVAA/KrNfVrRWRynlXwr+Cnw1+DGknSvh/o0di0gAnun/eXdxjvLM3zH/dGFHYCvVaKKQBRRRQAUUUUAFFFFABRRRQAUUUUAFFFFAH/1v3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/1/3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/0P3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/0f3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/0v3Eoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQB//9k="
+ }
+ ]
+ },
+ "advisories": [
+ {
+ "title": "GitHub Commit",
+ "url": "https://github.com/FasterXML/jackson-databind/commit/6799f8f10cc78e9af6d443ed6982d00a13f2e7d2"
+ },
+ {
+ "title": "GitHub Issue",
+ "url": "https://github.com/FasterXML/jackson-databind/issues/1931"
+ }
+ ],
+ "created": "2021-01-01T00:00:00.000Z",
+ "published": "2021-01-01T00:00:00.000Z",
+ "updated": "2021-01-01T00:00:00.000Z",
+ "rejected": "2022-01-01T00:00:00.000Z",
+ "credits": {
+ "organizations": [
+ {
+ "name": "Acme, Inc.",
+ "url": [
+ "https://example.com"
+ ]
+ }
+ ],
+ "individuals": [
+ {
+ "name": "Jane Doe",
+ "email": "jane.doe@example.com"
+ }
+ ]
+ },
+ "tools": {
+ "components": [
+ {
+ "type": "application",
+ "group": "Snyk",
+ "name": "Snyk CLI (Linux)",
+ "version": "1.729.0",
+ "hashes": [
+ {
+ "alg": "SHA-256",
+ "content": "2eaf8c62831a1658c95d41fdc683cd177c147733c64a93e59cb2362829e45b7d"
+ }
+ ]
+ }
+ ],
+ "services": [
+ {
+ "provider": {
+ "name": "Acme Inc"
+ },
+ "name": "Acme BOM Analyzer",
+ "endpoints": [
+ "https://example.com/analyze"
+ ]
+ }
+ ]
+ },
+ "analysis": {
+ "state": "not_affected",
+ "justification": "code_not_reachable",
+ "response": ["will_not_fix", "update"],
+ "detail": "An optional explanation of why the application is not affected by the vulnerable component.",
+ "firstIssued": "2022-01-01T00:00:00.000Z",
+ "lastUpdated": "2022-02-01T00:00:00.000Z"
+ },
+ "affects": [
+ {
+ "ref": "pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.9.4",
+ "versions": [
+ {
+ "range": "vers:semver/<2.6.7.5",
+ "status": "affected"
+ },
+ {
+ "range": "vers:semver/2.7.0|<2.8.11.1",
+ "status": "affected"
+ },
+ {
+ "range": "vers:semver/2.9.0|<2.9.5",
+ "status": "affected"
+ }
+ ]
+ }
+ ],
+ "properties": [
+ {
+ "name": "Foo",
+ "value": "Bar"
+ },
+ {
+ "name": "Foo",
+ "value": "You"
+ },
+ {
+ "name": "Foo",
+ "value": "Two"
+ },
+ {
+ "name": "Bar",
+ "value": "Foo"
+ }
+ ]
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-vulnerability-1.6.textproto b/tools/src/test/resources/1.7/valid-vulnerability-1.6.textproto
new file mode 100644
index 00000000..bec68ebf
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-vulnerability-1.6.textproto
@@ -0,0 +1,164 @@
+# proto-file: schema/bom-1.6.proto
+# proto-message: Bom
+
+spec_version: "1.6"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ bom_ref: "pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.9.4"
+ group: "com.fasterxml.jackson.core"
+ name: "jackson-databind"
+ version: "2.9.4"
+ purl: "pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.9.4"
+}
+vulnerabilities {
+ bom_ref: "6eee14da-8f42-4cc4-bb65-203235f02415"
+ id: "SNYK-JAVA-COMFASTERXMLJACKSONCORE-32111"
+ source: {
+ name: "Snyk"
+ url: "https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-32111"
+ }
+ references: {
+ id: "CVE-2018-7489"
+ source: {
+ name: "NVD",
+ url: "https://nvd.nist.gov/vuln/detail/CVE-2019-9997"
+ }
+ }
+ ratings: {
+ source: {
+ name: "NVD"
+ url: "https://nvd.nist.gov/vuln-metrics/cvss/v3-calculator?vector=AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H&version=3.0"
+ }
+ score: 9.8
+ severity: SEVERITY_CRITICAL
+ method: SCORE_METHOD_CVSSV3
+ vector: "AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H"
+ justification: "An optional reason for rating the vulnerability as it was"
+ }
+ cwes: 184
+ cwes: 502
+ description: "FasterXML jackson-databind before 2.7.9.3, 2.8.x before 2.8.11.1 and 2.9.x before 2.9.5 allows unauthenticated remote code execution because of an incomplete fix for the CVE-2017-7525 deserialization flaw. This is exploitable by sending maliciously crafted JSON input to the readValue method of the ObjectMapper, bypassing a blacklist that is ineffective if the c3p0 libraries are available in the classpath."
+ detail: ""
+ recommendation: "Upgrade com.fasterxml.jackson.core:jackson-databind to version 2.6.7.5, 2.8.11.1, 2.9.5 or higher."
+ proofOfConcept: {
+ reproductionSteps: "Precise steps to reproduce go here"
+ environment: "Describe the environment"
+ supportingMaterial: [
+ {
+ content_type: "image/jpeg"
+ encoding: "base64"
+ value: "/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAABQKADAAQAAAABAAABQAAAAAD/wAARCAFAAUADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9sAQwACAgICAgIDAgIDBQMDAwUGBQUFBQYIBgYGBgYICggICAgICAoKCgoKCgoKDAwMDAwMDg4ODg4PDw8PDw8PDw8P/9sAQwECAgIEBAQHBAQHEAsJCxAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQ/90ABAAU/9oADAMBAAIRAxEAPwD9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9D9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9H9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9L9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9P9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9T9xKKKKACiiigAooooAKKKKACiiigAooooAKKzdY1jSfD2lXWua7eRafp9jG0s9xO4SONF6szHgCvyK+P/APwUJ1zV7i68MfAxTpmnKTG2sTJ/pU3Ym3jbIiU9mYFz1AWmkB+qvjL4ieA/h5Z/bvHPiCy0OEjK/a51jZv91CdzfgDXy3r/APwUA/Zw0WVobPUr/WWXvZ2T7D9GmMQNfitofhT4ofGXX5ptHsdR8V6rK2Zrht85BPeSaQ7V/wCBMK+nvDv7Afxk1WJZtcvtL0PdzskmeeQfUQqVz/wI185nXF+VZc+XG4mMH2b1+5Xf4HTRwlWprCLZ9xW//BSD4DSy7JtO12Bf77WsBH5LOT+leweEP2yv2cfGc0drZeL4tNuJOBHqUclmST23yKI//H6/Om4/4J2eOli3Wvi/TJJP7rwzoPzAb+VeL+NP2NPjx4Ohku00aPXrWPJL6ZKJ2x/1yYLIfwU15WX+JeQYqfs6OMhfzfL/AOlJGk8trxV3Bn9Ctpd2t/bR3thPHc28w3JLEweNwe6spII+lWK/me+G3xr+LfwN1hj4P1e50zyXxcadcBmtnI6rLbScA+4CsOxr9mP2bv2x/Bfxz8rwzrUaeHfGIX/jzd8wXeBy1q7ck9zG3zDtuGTX2+6ujiPsmiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD//1f3EooooAKKKKACiiigAooooAKKKKACop54LWCS6upFhhhVnkdyFVEUZZmJ4AAGSalr88P8AgoV8aJ/BXgCz+F+hXBi1PxeGa7ZDho9OiOGX285/k91DChAfDv7Xn7Uuo/GzxHN4V8LXL2/gbSZSIUUlft8qHH2mUd1z/qlP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Behf9qCQ4Y/7jtn0r45v9L8e/DXVtmo2upeFtSjPV1ms5c+x+Un8DX9S1UdT0vS9atWsdasoNQtm4MVxEsyEf7rgiiSUk4yV0xp2P5zPD/7Vf7QHhxUSz8ZXV1EvRLxY7sfnKrN+terad+3x8crQBb2HSb8Du9q0bH8Y5FH6V+sniP8AZO/Z08UO8upeBNPhlfkvaB7Rs+v7hkH6V5Fqf/BPP9nS+YtZwarp2f8AnjfFgPoJVevlMbwHkmId62Dpt9+VJ/ekmdUMdWjtN/efEEP/AAUP+JiDE3hfR5D6g3C/+1KfL/wUQ+JLLiLwto6H1LXDf+1BX1fP/wAE1vgw7E2/iDXYh6NLbP8A+0RUcP8AwTU+DitmfxFrkg9A9uv6+Sa8n/iFHDl7/U4/fL/M1/tXEfznxVqf7fPxwvAVsINJ04Hulq0jD8ZJGH6V474m/ae+PPipHi1TxleQQv1jtClomD2/cqhx+NfrLpf/AATw/Z2sGDXseraljtPfbAfqIUjr2Xwz+yp+zx4SdJtJ8CadJMnIku0a8fPrm4aQfpXr4DgTJMM+ahg6afflTf3u7MZ46tL4pv7z+fPw34J+IfxN1Qx+F9G1HxJfTH5nhikuDk93lOQPqzV93fCr/gnH49154dS+K+qReGrE4ZrO1K3N6w9Cw/dR/XLn2r9l7Ozs9OtlstOt47S3ThYoUWNAPZVAA/KrNfVrRWRynlXwr+Cnw1+DGknSvh/o0di0gAnun/eXdxjvLM3zH/dGFHYCvVaKKQBRRRQAUUUUAFFFFABRRRQAUUUUAFFFFAH/1v3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/1/3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/0P3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/0f3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/0v3Eoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQB//9k="
+ }
+ ]
+ }
+ advisories: {
+ title: "GitHub Commit"
+ url: "https://github.com/FasterXML/jackson-databind/commit/6799f8f10cc78e9af6d443ed6982d00a13f2e7d2"
+ }
+ advisories: {
+ title: "GitHub Issue"
+ url: "https://github.com/FasterXML/jackson-databind/issues/1931"
+ }
+ created: {
+ seconds: 1609459200
+ nanos: 0
+ }
+ published: {
+ seconds: 1609459200
+ nanos: 0
+ }
+ updated: {
+ seconds: 1609459200
+ nanos: 0
+ }
+ rejected: {
+ seconds: 1640995200
+ nanos: 0
+ }
+ credits: {
+ organizations: {
+ name: "Acme, Inc."
+ url: "https://example.com"
+ }
+ individuals: {
+ name: "Jane Doe"
+ email: "jane.doe@example.com"
+ }
+ }
+ tools: {
+ components: [
+ {
+ type: CLASSIFICATION_APPLICATION,
+ group: "Snyk",
+ name: "Snyk CLI (Linux)",
+ version: "1.729.0",
+ hashes: [
+ {
+ alg: HASH_ALG_SHA_256
+ value: "2eaf8c62831a1658c95d41fdc683cd177c147733c64a93e59cb2362829e45b7d"
+ }
+ ]
+ }
+ ]
+ services: [
+ {
+ provider: {
+ name: "Acme Inc"
+ },
+ name: "Acme BOM Analyzer",
+ endpoints: [
+ "https://example.com/analyze"
+ ]
+ }
+ ]
+ }
+ analysis: {
+ state: IMPACT_ANALYSIS_STATE_NOT_AFFECTED
+ justification: IMPACT_ANALYSIS_JUSTIFICATION_CODE_NOT_REACHABLE
+ response: VULNERABILITY_RESPONSE_WILL_NOT_FIX
+ response: VULNERABILITY_RESPONSE_UPDATE
+ detail: "An optional explanation of why the application is not affected by the vulnerable component."
+ firstIssued: {
+ seconds: 1640995200
+ nanos: 0
+ }
+ lastUpdated: {
+ seconds: 1643673600
+ nanos: 0
+ }
+ }
+ affects: {
+ ref: "pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.9.4"
+ versions: {
+ range: "vers:semver/<2.6.7.5"
+ status: VULNERABILITY_AFFECTED_STATUS_AFFECTED
+ }
+ versions: {
+ range: "vers:semver/2.7.0|<2.8.11.1"
+ status: VULNERABILITY_AFFECTED_STATUS_AFFECTED
+ }
+ versions: {
+ range: "vers:semver/2.9.0|<2.9.5"
+ status: VULNERABILITY_AFFECTED_STATUS_AFFECTED
+ }
+ }
+ properties {
+ name: "Foo"
+ value: "Bar"
+ }
+ properties {
+ name: "Foo"
+ value: "You"
+ }
+ properties {
+ name: "Foo"
+ value: "Two"
+ }
+ properties {
+ name: "Bar"
+ value: "Foo"
+ }
+ workaround: "Describe the workarounds here"
+}
diff --git a/tools/src/test/resources/1.7/valid-vulnerability-1.6.xml b/tools/src/test/resources/1.7/valid-vulnerability-1.6.xml
new file mode 100644
index 00000000..33a5412f
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-vulnerability-1.6.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="library" bom-ref="pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.9.4">
+ <group>com.fasterxml.jackson.core</group>
+ <name>jackson-databind</name>
+ <version>2.9.4</version>
+ <purl>pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.9.4</purl>
+ </component>
+ </components>
+ <vulnerabilities>
+ <vulnerability bom-ref="6eee14da-8f42-4cc4-bb65-203235f02415">
+ <id>SNYK-JAVA-COMFASTERXMLJACKSONCORE-32111</id>
+ <source>
+ <name>Snyk</name>
+ <url>https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-32111</url>
+ </source>
+ <references>
+ <reference>
+ <id>CVE-2018-7489</id>
+ <source>
+ <name>NVD</name>
+ <url>https://nvd.nist.gov/vuln/detail/CVE-2019-9997</url>
+ </source>
+ </reference>
+ </references>
+ <ratings>
+ <rating>
+ <source>
+ <name>NVD</name>
+ <url>https://nvd.nist.gov/vuln-metrics/cvss/v3-calculator?vector=AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H&version=3.0</url>
+ </source>
+ <score>9.8</score>
+ <severity>critical</severity>
+ <method>CVSSv3</method>
+ <vector>AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H</vector>
+ <justification>An optional reason for rating the vulnerability as it was</justification>
+ </rating>
+ </ratings>
+ <cwes>
+ <cwe>184</cwe>
+ <cwe>502</cwe>
+ </cwes>
+ <description>FasterXML jackson-databind before 2.7.9.3, 2.8.x before 2.8.11.1 and 2.9.x before 2.9.5 allows unauthenticated remote code execution because of an incomplete fix for the CVE-2017-7525 deserialization flaw. This is exploitable by sending maliciously crafted JSON input to the readValue method of the ObjectMapper, bypassing a blacklist that is ineffective if the c3p0 libraries are available in the classpath.</description>
+ <detail></detail>
+ <recommendation>Upgrade com.fasterxml.jackson.core:jackson-databind to version 2.6.7.5, 2.8.11.1, 2.9.5 or higher.</recommendation>
+ <workaround>Describe the workarounds here</workaround>
+ <proofOfConcept>
+ <reproductionSteps>Precise steps to reproduce go here</reproductionSteps>
+ <environment>Describe the environment</environment>
+ <supportingMaterial>
+ <attachment content-type="image/jpeg" encoding="base64">/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAABQKADAAQAAAABAAABQAAAAAD/wAARCAFAAUADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9sAQwACAgICAgIDAgIDBQMDAwUGBQUFBQYIBgYGBgYICggICAgICAoKCgoKCgoKDAwMDAwMDg4ODg4PDw8PDw8PDw8P/9sAQwECAgIEBAQHBAQHEAsJCxAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQ/90ABAAU/9oADAMBAAIRAxEAPwD9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9D9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9H9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9L9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9P9xKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD/9T9xKKKKACiiigAooooAKKKKACiiigAooooAKKzdY1jSfD2lXWua7eRafp9jG0s9xO4SONF6szHgCvyK+P/APwUJ1zV7i68MfAxTpmnKTG2sTJ/pU3Ym3jbIiU9mYFz1AWmkB+qvjL4ieA/h5Z/bvHPiCy0OEjK/a51jZv91CdzfgDXy3r/APwUA/Zw0WVobPUr/WWXvZ2T7D9GmMQNfitofhT4ofGXX5ptHsdR8V6rK2Zrht85BPeSaQ7V/wCBMK+nvDv7Afxk1WJZtcvtL0PdzskmeeQfUQqVz/wI185nXF+VZc+XG4mMH2b1+5Xf4HTRwlWprCLZ9xW//BSD4DSy7JtO12Bf77WsBH5LOT+leweEP2yv2cfGc0drZeL4tNuJOBHqUclmST23yKI//H6/Om4/4J2eOli3Wvi/TJJP7rwzoPzAb+VeL+NP2NPjx4Ohku00aPXrWPJL6ZKJ2x/1yYLIfwU15WX+JeQYqfs6OMhfzfL/AOlJGk8trxV3Bn9Ctpd2t/bR3thPHc28w3JLEweNwe6spII+lWK/me+G3xr+LfwN1hj4P1e50zyXxcadcBmtnI6rLbScA+4CsOxr9mP2bv2x/Bfxz8rwzrUaeHfGIX/jzd8wXeBy1q7ck9zG3zDtuGTX2+6ujiPsmiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigD//1f3EooooAKKKKACiiigAooooAKKKKACop54LWCS6upFhhhVnkdyFVEUZZmJ4AAGSalr88P8AgoV8aJ/BXgCz+F+hXBi1PxeGa7ZDho9OiOGX285/k91DChAfDv7Xn7Uuo/GzxHN4V8LXL2/gbSZSIUUlft8qHH2mUd1z/qlP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Behf9qCQ4Y/7jtn0r45v9L8e/DXVtmo2upeFtSjPV1ms5c+x+Un8DX9S1UdT0vS9atWsdasoNQtm4MVxEsyEf7rgiiSUk4yV0xp2P5zPD/7Vf7QHhxUSz8ZXV1EvRLxY7sfnKrN+terad+3x8crQBb2HSb8Du9q0bH8Y5FH6V+sniP8AZO/Z08UO8upeBNPhlfkvaB7Rs+v7hkH6V5Fqf/BPP9nS+YtZwarp2f8AnjfFgPoJVevlMbwHkmId62Dpt9+VJ/ekmdUMdWjtN/efEEP/AAUP+JiDE3hfR5D6g3C/+1KfL/wUQ+JLLiLwto6H1LXDf+1BX1fP/wAE1vgw7E2/iDXYh6NLbP8A+0RUcP8AwTU+DitmfxFrkg9A9uv6+Sa8n/iFHDl7/U4/fL/M1/tXEfznxVqf7fPxwvAVsINJ04Hulq0jD8ZJGH6V474m/ae+PPipHi1TxleQQv1jtClomD2/cqhx+NfrLpf/AATw/Z2sGDXseraljtPfbAfqIUjr2Xwz+yp+zx4SdJtJ8CadJMnIku0a8fPrm4aQfpXr4DgTJMM+ahg6afflTf3u7MZ46tL4pv7z+fPw34J+IfxN1Qx+F9G1HxJfTH5nhikuDk93lOQPqzV93fCr/gnH49154dS+K+qReGrE4ZrO1K3N6w9Cw/dR/XLn2r9l7Ozs9OtlstOt47S3ThYoUWNAPZVAA/KrNfVrRWRynlXwr+Cnw1+DGknSvh/o0di0gAnun/eXdxjvLM3zH/dGFHYCvVaKKQBRRRQAUUUUAFFFFABRRRQAUUUUAFFFFAH/1v3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/1/3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/0P3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/0f3EooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/0v3Eoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQBRoq9/Z15/zz/UUf2def8APP8AUUAUaKvf2def88/1FH9nXn/PP9RQBRoq9/Z15/zz/UUf2def88/1FAFGir39nXn/ADz/AFFH9nXn/PP9RQB//9k=</attachment>
+ </supportingMaterial>
+ </proofOfConcept>
+ <advisories>
+ <advisory>
+ <title>GitHub Commit</title>
+ <url>https://github.com/FasterXML/jackson-databind/commit/6799f8f10cc78e9af6d443ed6982d00a13f2e7d2</url>
+ </advisory>
+ <advisory>
+ <title>GitHub Issue</title>
+ <url>https://github.com/FasterXML/jackson-databind/issues/1931</url>
+ </advisory>
+ </advisories>
+ <created>2021-01-01T00:00:00.000Z</created>
+ <published>2021-01-01T00:00:00.000Z</published>
+ <updated>2021-01-01T00:00:00.000Z</updated>
+ <rejected>2022-01-01T00:00:00.000Z</rejected>
+ <credits>
+ <organizations>
+ <organization>
+ <name>Acme, Inc.</name>
+ <url>https://example.com</url>
+ </organization>
+ </organizations>
+ <individuals>
+ <individual>
+ <name>Jane Doe</name>
+ <email>jane.doe@example.com</email>
+ </individual>
+ </individuals>
+ </credits>
+ <tools>
+ <components>
+ <component type="application">
+ <group>Snyk</group>
+ <name>Snyk CLI (Linux)</name>
+ <version>1.729.0</version>
+ <hashes>
+ <hash alg="SHA-256">2eaf8c62831a1658c95d41fdc683cd177c147733c64a93e59cb2362829e45b7d</hash>
+ </hashes>
+ </component>
+ </components>
+ <services>
+ <service>
+ <provider>
+ <name>Acme Inc</name>
+ </provider>
+ <name>Acme BOM Analyzer</name>
+ <endpoints>
+ <endpoint>https://example.com/analyze</endpoint>
+ </endpoints>
+ </service>
+ </services>
+ </tools>
+ <analysis>
+ <state>not_affected</state>
+ <justification>code_not_reachable</justification>
+ <responses>
+ <response>will_not_fix</response>
+ <response>update</response>
+ </responses>
+ <detail>An optional explanation of why the application is not affected by the vulnerable component.</detail>
+ <firstIssued>2022-01-01T00:00:00.000Z</firstIssued>
+ <lastUpdated>2022-02-01T00:00:00.000Z</lastUpdated>
+ </analysis>
+ <affects>
+ <target>
+ <ref>pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.9.4</ref>
+ <versions>
+ <version>
+ <range>vers:semver/<2.6.7.5</range>
+ <status>affected</status>
+ </version>
+ <version>
+ <range>vers:semver/2.7.0|<2.8.11.1</range>
+ <status>affected</status>
+ </version>
+ <version>
+ <range>vers:semver/2.9.0|<2.9.5</range>
+ <status>affected</status>
+ </version>
+ </versions>
+ </target>
+ </affects>
+ <properties>
+ <property name="Foo">Bar</property>
+ <property name="Foo">You</property>
+ <property name="Foo">Two</property>
+ <property name="Bar">Foo</property>
+ </properties>
+ </vulnerability>
+ </vulnerabilities>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-xml-signature-1.6.xml b/tools/src/test/resources/1.7/valid-xml-signature-1.6.xml
new file mode 100644
index 00000000..930c06ac
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-xml-signature-1.6.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+ <components>
+ <component type="application">
+ <publisher>Acme Inc</publisher>
+ <group>com.acme</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <hashes>
+ <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
+ <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
+ <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
+ <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
+ <pedigree>
+ <ancestors>
+ <component type="application">
+ <publisher>Apache</publisher>
+ <group>org.apache.tomcat</group>
+ <name>tomcat-catalina</name>
+ <version>9.0.14</version>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ </license>
+ </licenses>
+ <purl>pkg:maven/org.apache.tomcat/tomcat-catalina@9.0.14?packaging=jar</purl>
+
+ </component>
+ </ancestors>
+ <commits>
+ <commit>
+ <uid>7638417db6d59f3c431d3e1f261cc637155684cd</uid>
+ <url>https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd</url>
+ <author>
+ <timestamp>2018-11-07T22:01:45Z</timestamp>
+ <name>John Doe</name>
+ <email>jdoe@example.com</email>
+ </author>
+ <committer>
+ <timestamp>2018-11-07T22:01:45Z</timestamp>
+ <name>John Doe</name>
+ <email>jdoe@example.com</email>
+ </committer>
+ <message>Initial commit</message>
+ </commit>
+ </commits>
+ </pedigree>
+ </component>
+ <component type="library">
+ <group>org.example</group>
+ <name>mylibrary</name>
+ <version>1.0.0</version>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">2342c2eaf1feb9a80195dbaddf2ebaa3</hash>
+ <hash alg="SHA-1">68b78babe00a053f9e35ec6a2d9080f5b90122b0</hash>
+ <hash alg="SHA-256">708f1f53b41f11f02d12a11b1a38d2905d47b099afc71a0f1124ef8582ec7313</hash>
+ <hash alg="SHA-512">387b7ae16b9cae45f830671541539bf544202faae5aac544a93b7b0a04f5f846fa2f4e81ef3f1677e13aed7496408a441f5657ab6d54423e56bf6f38da124aef</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ <text content-type="text/xml" encoding="base64">blah</text>
+ <url>fdaf</url>
+ </license>
+ </licenses>
+ <copyright>Copyright Example Inc. All rights reserved.</copyright>
+ <cpe>cpe:/a:example:myapplication:1.0.0</cpe>
+ <purl>pkg:maven/com.example/myapplication@1.0.0?packaging=war</purl>
+ <modified>false</modified>
+ </component>
+ <component type="framework">
+ <group>com.example</group>
+ <name>myframework</name>
+ <version>1.0.0</version>
+ <description>Example Inc, enterprise framework</description>
+ <scope>required</scope>
+ <hashes>
+ <hash alg="MD5">cfcb0b64aacd2f81c1cd546543de965a</hash>
+ <hash alg="SHA-1">7fbeef2346c45d565c3341f037bce4e088af8a52</hash>
+ <hash alg="SHA-256">0384db3cec55d86a6898c489fdb75a8e75fe66b26639634983d2f3c3558493d1</hash>
+ <hash alg="SHA-512">854909cdb9e3ca183056837144aab6d8069b377bd66445087cc7157bf0c3f620418705dd0b83bdc2f73a508c2bdb316ca1809d75ee6972d02023a3e7dd655c79</hash>
+ </hashes>
+ <licenses>
+ <license>
+ <id>Apache-2.0</id>
+ </license>
+ </licenses>
+ <purl>pkg:maven/com.example/myframework@1.0.0?packaging=war</purl>
+ <modified>false</modified>
+ <externalReferences>
+ <reference type="website">
+ <url>http://example.com/myframework</url>
+ </reference>
+ <reference type="advisories">
+ <url>http://example.com/security</url>
+ </reference>
+ </externalReferences>
+ </component>
+ </components>
+ <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:SignedInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
+ <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
+ <ds:Reference URI="" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:Transforms xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
+ </ds:Transforms>
+ <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
+ <ds:DigestValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">PrB8/rofGs34XwIX5OIdYSjV2aKSe5VaztJKBvsgjIk=</ds:DigestValue>
+ </ds:Reference>
+ </ds:SignedInfo>
+ <ds:SignatureValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ ePGNg30Zl9CW7RZdcRn8gFCp1AlWncjudA9pQDXyqZOvyj9RC2YtkI688WdfDOdVRZs6mflJFXr7
+ IKA9wY6jVrEqZmlef55Qp/8iGwOjOjWbwYsm2AhrdkUi9gaFSWEd8uITYHOpWbiPFSsnimiK9+ft
+ 56dkg/oJMLdXzlaukzq9iGkRcafRkW433OQcZIXwD2K8lg4cdD0pNNNqBa+PgIvzbxA5H84TyQDB
+ HBcQiw/j1edRBJgPOwlqzZDUawOJaFhAPUQ+GGKMetIJH2FqqrHXGuV1NIwnbWTCg40RdOcBdCrl
+ PDtDVjFh34uZ4dYBpJBIlM4daD2N4B6WPB5iHRyuZTczF2q03ObabuTgkpK6EeadFVqFNsEOOPPt
+ MDDyda+Lwff5KjvUHvRRtUDIOm2rNIQKzaseulwYcA9UWQHAFcupJmWcLLM4zzY7F/uOdZuSurzh
+ U6h5kdb76Juepof6ee4Q5YpwNOGNL5JfB4C3sc/Dbbv8dZ8OuXFYSZN7reUGZzCNksByqERPEbAe
+ n1ldJu1HnRXRQpwaon8Asy9CuNmPfFCfDwOs2B4p4tb+tLNIKFHdRlpd19Zr9vCMCbltXeqq0Cpq
+ OejSyLYGqSWzzzUh449dJrg6KTevrTNEln5GAlLBFSdjM5JA7KV2u/GyDVFwSEW7UKooGN4CtgU=
+ </ds:SignatureValue>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509SubjectName xmlns:ds="http://www.w3.org/2000/09/xmldsig#">CN=bomsigner,OU=development,O=cyclonedx</ds:X509SubjectName>
+ <ds:X509Certificate xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ MIIE+DCCAuCgAwIBAgIEXGzayTANBgkqhkiG9w0BAQsFADA+MRIwEAYDVQQKDAljeWNsb25lZHgx
+ FDASBgNVBAsMC2RldmVsb3BtZW50MRIwEAYDVQQDDAlib21zaWduZXIwHhcNMTkwMjIwMDQ0MjQ5
+ WhcNNDkwMjIwMDQ0MjQ5WjA+MRIwEAYDVQQKDAljeWNsb25lZHgxFDASBgNVBAsMC2RldmVsb3Bt
+ ZW50MRIwEAYDVQQDDAlib21zaWduZXIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCo
+ 5JZsM4ZLfWW/dpRlU6CpnItWspddF+bEVDETKVwVj9tGpqR5jURgKS/BOQP2TGUsR3/ZJJBhYRll
+ ONhrUQrVKV/I6wp3Z40qPEa1RJLE+QlG9iL8qBV52CnXkLmnUSax3dspSzmSct5vDiTnvpHG9jr0
+ AKFeTjy7U9rv8GJybz0ijwlpBoO9JRdYPX2PrrzoSeJLoxKq+GwuyCZ5LhXRN0p1a+NAirTAmY+c
+ G1ZTLkMmfeCUy1t6H/bG4RnYOSSPOvk7Rb68lQpUqb+pbbNuB2o/b9cDwtLLCtGVlu+5Wj8mrytY
+ 3FGFQM20j3yVeRInmGqTTDBelQa/CO4JKqBlmaeYEIvNYbFs9+AlqadivwDO51RpdPo9fPSpsBpy
+ ZMv6S2bXNuUML+Rk99WyKJTPM0PTZhRLZ64ZXEhlz3kQWVoSlrcwwim6sj6LRUb5IRqA3lxRFUI6
+ NXKyiQLamQp+t3/9OGW9L1rLCcw7yFo0s8LhMTPMiv4ol9/hQViT+8ICzDsr0OM9ZiF4/UagFRlt
+ IClV70cjh1DpsZjzQIRVGaj8uQ/JdtfRz4E43Ki7U0a2Vpho/t6poLVndv46tkX5nYGtMW4WfMoD
+ ZflQ9pajvvKtr2jB1wob6nsU+VTmAcWZy4BCPH+XyfDw/0SFBdUceJJJtPWIeYFDUY7onptf+wID
+ AQABMA0GCSqGSIb3DQEBCwUAA4ICAQCOVariNgK+9OF/5T9ZaSvZbkk45RTmzgQNXtFc5xfRvqwP
+ s+pu/DFXm1R+ltjyS5j3w6NBZUFUI5MqLQr6JEEDrbu8BvfBO57wJNAEATj1JIHEfDfh7BxnBF8f
+ oYFOwbrh4jOt0wz0FW2obsSVmF4GSvS7tTlWqTcsxjdZVmwP40RWu18B9jzv7M61adrWD3ksDA5O
+ amSOsZi3Nt0aacDkyGRdCIEFi0fplxQInXMtD1z3RhXu2JSTAIr54Cei49Bh71kAXSWHMCog/f8a
+ lSrZyqZBty/ACfU9DqlPIM+giHePKm4z2bcdpUdKZk6wcKDn4CvuBOqsMBMg7L05UEyyqTPD/4dk
+ 2GwJ8Nv0E5gsYHCIXF2cZ3OUVsw0mB/ozleEJVDE02uZZN/1wW1Xq028LsMdgN0Wk1WvWyF5MEdh
+ nPWuhqp6tNaDI/kK6XQF+LjYJUzua3AQFOHfYNLKhO6d+bJ4rr0833v4v3cLW34kbXkKb6U3Yv8X
+ SK3jBGCACiPgnc0N6awkh1kDlrZQ7GMsl14c+2+vpl9Lf0sL0mRUIyICfSC8MjlsP/BZH3emyfsk
+ iWivPALomycKqP+PSkt1WaWApGENZWk1wNN99FYSYlt6LViW2p6T97fRx4jPRlHu+wecfD2k9RP4
+ bt5W2HWfOP0zNAS7SnAVLEl2QZxXKw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ <ds:KeyValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:RSAKeyValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:Modulus xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ qOSWbDOGS31lv3aUZVOgqZyLVrKXXRfmxFQxEylcFY/bRqakeY1EYCkvwTkD9kxlLEd/2SSQYWEZ
+ ZTjYa1EK1SlfyOsKd2eNKjxGtUSSxPkJRvYi/KgVedgp15C5p1Emsd3bKUs5knLebw4k576RxvY6
+ 9AChXk48u1Pa7/Bicm89Io8JaQaDvSUXWD19j6686EniS6MSqvhsLsgmeS4V0TdKdWvjQIq0wJmP
+ nBtWUy5DJn3glMtbeh/2xuEZ2Dkkjzr5O0W+vJUKVKm/qW2zbgdqP2/XA8LSywrRlZbvuVo/Jq8r
+ WNxRhUDNtI98lXkSJ5hqk0wwXpUGvwjuCSqgZZmnmBCLzWGxbPfgJamnYr8AzudUaXT6PXz0qbAa
+ cmTL+ktm1zblDC/kZPfVsiiUzzND02YUS2euGVxIZc95EFlaEpa3MMIpurI+i0VG+SEagN5cURVC
+ OjVysokC2pkKfrd//ThlvS9aywnMO8haNLPC4TEzzIr+KJff4UFYk/vCAsw7K9DjPWYheP1GoBUZ
+ bSApVe9HI4dQ6bGY80CEVRmo/LkPyXbX0c+BONyou1NGtlaYaP7eqaC1Z3b+OrZF+Z2BrTFuFnzK
+ A2X5UPaWo77yra9owdcKG+p7FPlU5gHFmcuAQjx/l8nw8P9EhQXVHHiSSbT1iHmBQ1GO6J6bX/s=
+ </ds:Modulus>
+ <ds:Exponent xmlns:ds="http://www.w3.org/2000/09/xmldsig#">AQAB</ds:Exponent>
+ </ds:RSAKeyValue>
+ </ds:KeyValue>
+ </ds:KeyInfo>
+ </ds:Signature></bom>
From 4010887cbe06e0921ea5e9d4c7852d199dab8db7 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Wed, 22 Jan 2025 09:50:32 +0100
Subject: [PATCH 12/42] tests: rename tests for 1.7
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
.../{invalid-bomformat-1.6.json => invalid-bomformat-1.7.json} | 0
...alid-component-ref-1.6.json => invalid-component-ref-1.7.json} | 0
...nvalid-component-ref-1.6.xml => invalid-component-ref-1.7.xml} | 0
...id-component-swid-1.6.json => invalid-component-swid-1.7.json} | 0
...alid-component-swid-1.6.xml => invalid-component-swid-1.7.xml} | 0
...id-component-type-1.6.json => invalid-component-type-1.7.json} | 0
...alid-component-type-1.6.xml => invalid-component-type-1.7.xml} | 0
.../{invalid-dependency-1.6.json => invalid-dependency-1.7.json} | 0
.../{invalid-dependency-1.6.xml => invalid-dependency-1.7.xml} | 0
...-empty-component-1.6.json => invalid-empty-component-1.7.json} | 0
...id-empty-component-1.6.xml => invalid-empty-component-1.7.xml} | 0
.../1.7/{invalid-hash-alg-1.6.json => invalid-hash-alg-1.7.json} | 0
.../1.7/{invalid-hash-alg-1.6.xml => invalid-hash-alg-1.7.xml} | 0
.../1.7/{invalid-hash-md5-1.6.json => invalid-hash-md5-1.7.json} | 0
.../1.7/{invalid-hash-md5-1.6.xml => invalid-hash-md5-1.7.xml} | 0
.../{invalid-hash-sha1-1.6.json => invalid-hash-sha1-1.7.json} | 0
.../1.7/{invalid-hash-sha1-1.6.xml => invalid-hash-sha1-1.7.xml} | 0
...{invalid-hash-sha256-1.6.json => invalid-hash-sha256-1.7.json} | 0
.../{invalid-hash-sha256-1.6.xml => invalid-hash-sha256-1.7.xml} | 0
...{invalid-hash-sha512-1.6.json => invalid-hash-sha512-1.7.json} | 0
.../{invalid-hash-sha512-1.6.xml => invalid-hash-sha512-1.7.xml} | 0
.../{invalid-issue-type-1.6.json => invalid-issue-type-1.7.json} | 0
.../{invalid-issue-type-1.6.xml => invalid-issue-type-1.7.xml} | 0
...id-license-choice-1.6.json => invalid-license-choice-1.7.json} | 0
...alid-license-choice-1.6.xml => invalid-license-choice-1.7.xml} | 0
...icense-encoding-1.6.json => invalid-license-encoding-1.7.json} | 0
...-license-encoding-1.6.xml => invalid-license-encoding-1.7.xml} | 0
.../{invalid-license-id-1.6.json => invalid-license-id-1.7.json} | 0
.../{invalid-license-id-1.6.xml => invalid-license-id-1.7.xml} | 0
...-license-id-count-1.6.xml => invalid-license-id-count-1.7.xml} | 0
...name-1.6.json => invalid-license-missing-id-and-name-1.7.json} | 0
...extproto => invalid-license-missing-id-and-name-1.7.textproto} | 0
...d-name-1.6.xml => invalid-license-missing-id-and-name-1.7.xml} | 0
...ense-name-count-1.6.xml => invalid-license-name-count-1.7.xml} | 0
...etadata-license-1.6.json => invalid-metadata-license-1.7.json} | 0
...-metadata-license-1.6.xml => invalid-metadata-license-1.7.xml} | 0
...ata-timestamp-1.6.json => invalid-metadata-timestamp-1.7.json} | 0
...adata-timestamp-1.6.xml => invalid-metadata-timestamp-1.7.xml} | 0
...nent-type-1.6.json => invalid-missing-component-type-1.7.json} | 0
...ponent-type-1.6.xml => invalid-missing-component-type-1.7.xml} | 0
.../1.7/{invalid-namespace-1.6.xml => invalid-namespace-1.7.xml} | 0
.../{invalid-patch-type-1.6.json => invalid-patch-type-1.7.json} | 0
.../{invalid-patch-type-1.6.xml => invalid-patch-type-1.7.xml} | 0
.../{invalid-properties-1.6.json => invalid-properties-1.7.json} | 0
...-properties-1.6.textproto => invalid-properties-1.7.textproto} | 0
.../{invalid-properties-1.6.xml => invalid-properties-1.7.xml} | 0
.../1.7/{invalid-scope-1.6.json => invalid-scope-1.7.json} | 0
.../1.7/{invalid-scope-1.6.xml => invalid-scope-1.7.xml} | 0
...nvalid-serialnumber-1.6.json => invalid-serialnumber-1.7.json} | 0
...{invalid-serialnumber-1.6.xml => invalid-serialnumber-1.7.xml} | 0
...nvalid-service-data-1.6.json => invalid-service-data-1.7.json} | 0
...{invalid-service-data-1.6.xml => invalid-service-data-1.7.xml} | 0
.../1.7/{valid-annotation-1.6.json => valid-annotation-1.7.json} | 0
...id-annotation-1.6.textproto => valid-annotation-1.7.textproto} | 0
.../1.7/{valid-annotation-1.6.xml => valid-annotation-1.7.xml} | 0
.../1.7/{valid-assembly-1.6.json => valid-assembly-1.7.json} | 0
...{valid-assembly-1.6.textproto => valid-assembly-1.7.textproto} | 0
.../1.7/{valid-assembly-1.6.xml => valid-assembly-1.7.xml} | 0
.../{valid-attestation-1.6.json => valid-attestation-1.7.json} | 0
...-attestation-1.6.textproto => valid-attestation-1.7.textproto} | 0
.../1.7/{valid-attestation-1.6.xml => valid-attestation-1.7.xml} | 0
.../test/resources/1.7/{valid-bom-1.6.json => valid-bom-1.7.json} | 0
.../1.7/{valid-bom-1.6.textproto => valid-bom-1.7.textproto} | 0
.../test/resources/1.7/{valid-bom-1.6.xml => valid-bom-1.7.xml} | 0
...alid-component-data-1.6.json => valid-component-data-1.7.json} | 0
...nent-data-1.6.textproto => valid-component-data-1.7.textproto} | 0
...{valid-component-data-1.6.xml => valid-component-data-1.7.xml} | 0
...-component-hashes-1.6.json => valid-component-hashes-1.7.json} | 0
...-hashes-1.6.textproto => valid-component-hashes-1.7.textproto} | 0
...id-component-hashes-1.6.xml => valid-component-hashes-1.7.xml} | 0
...-identifiers-1.6.json => valid-component-identifiers-1.7.json} | 0
...rs-1.6.textproto => valid-component-identifiers-1.7.textproto} | 0
...nt-identifiers-1.6.xml => valid-component-identifiers-1.7.xml} | 0
...{valid-component-ref-1.6.json => valid-component-ref-1.7.json} | 0
...ponent-ref-1.6.textproto => valid-component-ref-1.7.textproto} | 0
.../{valid-component-ref-1.6.xml => valid-component-ref-1.7.xml} | 0
...alid-component-swid-1.6.json => valid-component-swid-1.7.json} | 0
...nent-swid-1.6.textproto => valid-component-swid-1.7.textproto} | 0
...{valid-component-swid-1.6.xml => valid-component-swid-1.7.xml} | 0
...nent-swid-full-1.6.json => valid-component-swid-full-1.7.json} | 0
...full-1.6.textproto => valid-component-swid-full-1.7.textproto} | 0
...ponent-swid-full-1.6.xml => valid-component-swid-full-1.7.xml} | 0
...id-component-types-1.6.json => valid-component-types-1.7.json} | 0
...nt-types-1.6.textproto => valid-component-types-1.7.textproto} | 0
...alid-component-types-1.6.xml => valid-component-types-1.7.xml} | 0
.../{valid-compositions-1.6.json => valid-compositions-1.7.json} | 0
...ompositions-1.6.textproto => valid-compositions-1.7.textproto} | 0
.../{valid-compositions-1.6.xml => valid-compositions-1.7.xml} | 0
...ryptography-full-1.6.json => valid-cryptography-full-1.7.json} | 0
...y-full-1.6.textproto => valid-cryptography-full-1.7.textproto} | 0
...-cryptography-full-1.6.xml => valid-cryptography-full-1.7.xml} | 0
...tation-1.6.json => valid-cryptography-implementation-1.7.json} | 0
....textproto => valid-cryptography-implementation-1.7.textproto} | 0
...entation-1.6.xml => valid-cryptography-implementation-1.7.xml} | 0
.../1.7/{valid-dependency-1.6.json => valid-dependency-1.7.json} | 0
...id-dependency-1.6.textproto => valid-dependency-1.7.textproto} | 0
.../1.7/{valid-dependency-1.6.xml => valid-dependency-1.7.xml} | 0
...-empty-components-1.6.json => valid-empty-components-1.7.json} | 0
...ponents-1.6.textproto => valid-empty-components-1.7.textproto} | 0
...id-empty-components-1.6.xml => valid-empty-components-1.7.xml} | 0
.../1.7/{valid-evidence-1.6.json => valid-evidence-1.7.json} | 0
...{valid-evidence-1.6.textproto => valid-evidence-1.7.textproto} | 0
.../1.7/{valid-evidence-1.6.xml => valid-evidence-1.7.xml} | 0
...-external-elements-1.6.xml => valid-external-elements-1.7.xml} | 0
...ernal-reference-1.6.json => valid-external-reference-1.7.json} | 0
...rence-1.6.textproto => valid-external-reference-1.7.textproto} | 0
...xternal-reference-1.6.xml => valid-external-reference-1.7.xml} | 0
.../{valid-formulation-1.6.json => valid-formulation-1.7.json} | 0
...-formulation-1.6.textproto => valid-formulation-1.7.textproto} | 0
.../1.7/{valid-formulation-1.6.xml => valid-formulation-1.7.xml} | 0
...ense-expression-1.6.json => valid-license-expression-1.7.json} | 0
...ssion-1.6.textproto => valid-license-expression-1.7.textproto} | 0
...icense-expression-1.6.xml => valid-license-expression-1.7.xml} | 0
.../1.7/{valid-license-id-1.6.json => valid-license-id-1.7.json} | 0
...id-license-id-1.6.textproto => valid-license-id-1.7.textproto} | 0
.../1.7/{valid-license-id-1.6.xml => valid-license-id-1.7.xml} | 0
...icense-licensing-1.6.json => valid-license-licensing-1.7.json} | 0
...ensing-1.6.textproto => valid-license-licensing-1.7.textproto} | 0
...-license-licensing-1.6.xml => valid-license-licensing-1.7.xml} | 0
.../{valid-license-name-1.6.json => valid-license-name-1.7.json} | 0
...icense-name-1.6.textproto => valid-license-name-1.7.textproto} | 0
.../{valid-license-name-1.6.xml => valid-license-name-1.7.xml} | 0
...-machine-learning-1.6.json => valid-machine-learning-1.7.json} | 0
...earning-1.6.textproto => valid-machine-learning-1.7.textproto} | 0
...id-machine-learning-1.6.xml => valid-machine-learning-1.7.xml} | 0
....6.json => valid-machine-learning-considerations-env-1.7.json} | 0
...to => valid-machine-learning-considerations-env-1.7.textproto} | 0
...-1.6.xml => valid-machine-learning-considerations-env-1.7.xml} | 0
...id-metadata-author-1.6.json => valid-metadata-author-1.7.json} | 0
...a-author-1.6.textproto => valid-metadata-author-1.7.textproto} | 0
...alid-metadata-author-1.6.xml => valid-metadata-author-1.7.xml} | 0
...-metadata-license-1.6.json => valid-metadata-license-1.7.json} | 0
...license-1.6.textproto => valid-metadata-license-1.7.textproto} | 0
...id-metadata-license-1.6.xml => valid-metadata-license-1.7.xml} | 0
...adata-lifecycle-1.6.json => valid-metadata-lifecycle-1.7.json} | 0
...cycle-1.6.textproto => valid-metadata-lifecycle-1.7.textproto} | 0
...etadata-lifecycle-1.6.xml => valid-metadata-lifecycle-1.7.xml} | 0
...a-manufacture-1.6.json => valid-metadata-manufacture-1.7.json} | 0
...ure-1.6.textproto => valid-metadata-manufacture-1.7.textproto} | 0
...ata-manufacture-1.6.xml => valid-metadata-manufacture-1.7.xml} | 0
...manufacturer-1.6.json => valid-metadata-manufacturer-1.7.json} | 0
...er-1.6.textproto => valid-metadata-manufacturer-1.7.textproto} | 0
...a-manufacturer-1.6.xml => valid-metadata-manufacturer-1.7.xml} | 0
...etadata-supplier-1.6.json => valid-metadata-supplier-1.7.json} | 0
...pplier-1.6.textproto => valid-metadata-supplier-1.7.textproto} | 0
...-metadata-supplier-1.6.xml => valid-metadata-supplier-1.7.xml} | 0
...adata-timestamp-1.6.json => valid-metadata-timestamp-1.7.json} | 0
...stamp-1.6.textproto => valid-metadata-timestamp-1.7.textproto} | 0
...etadata-timestamp-1.6.xml => valid-metadata-timestamp-1.7.xml} | 0
...{valid-metadata-tool-1.6.json => valid-metadata-tool-1.7.json} | 0
...adata-tool-1.6.textproto => valid-metadata-tool-1.7.textproto} | 0
.../{valid-metadata-tool-1.6.xml => valid-metadata-tool-1.7.xml} | 0
...eprecated-1.6.json => valid-metadata-tool-deprecated-1.7.json} | 0
...1.6.textproto => valid-metadata-tool-deprecated-1.7.textproto} | 0
...-deprecated-1.6.xml => valid-metadata-tool-deprecated-1.7.xml} | 0
...alid-minimal-viable-1.6.json => valid-minimal-viable-1.7.json} | 0
...al-viable-1.6.textproto => valid-minimal-viable-1.7.textproto} | 0
...{valid-minimal-viable-1.6.xml => valid-minimal-viable-1.7.xml} | 0
.../resources/1.7/{valid-patch-1.6.json => valid-patch-1.7.json} | 0
.../1.7/{valid-patch-1.6.textproto => valid-patch-1.7.textproto} | 0
.../resources/1.7/{valid-patch-1.6.xml => valid-patch-1.7.xml} | 0
.../1.7/{valid-properties-1.6.json => valid-properties-1.7.json} | 0
...id-properties-1.6.textproto => valid-properties-1.7.textproto} | 0
.../1.7/{valid-properties-1.6.xml => valid-properties-1.7.xml} | 0
...-random-attributes-1.6.xml => valid-random-attributes-1.7.xml} | 0
...{valid-release-notes-1.6.json => valid-release-notes-1.7.json} | 0
...ease-notes-1.6.textproto => valid-release-notes-1.7.textproto} | 0
.../{valid-release-notes-1.6.xml => valid-release-notes-1.7.xml} | 0
.../1.7/{valid-saasbom-1.6.json => valid-saasbom-1.7.json} | 0
.../{valid-saasbom-1.6.textproto => valid-saasbom-1.7.textproto} | 0
.../1.7/{valid-saasbom-1.6.xml => valid-saasbom-1.7.xml} | 0
.../1.7/{valid-service-1.6.json => valid-service-1.7.json} | 0
.../{valid-service-1.6.textproto => valid-service-1.7.textproto} | 0
.../1.7/{valid-service-1.6.xml => valid-service-1.7.xml} | 0
...mpty-objects-1.6.json => valid-service-empty-objects-1.7.json} | 0
...ts-1.6.textproto => valid-service-empty-objects-1.7.textproto} | 0
...-empty-objects-1.6.xml => valid-service-empty-objects-1.7.xml} | 0
.../1.7/{valid-signatures-1.6.json => valid-signatures-1.7.json} | 0
.../1.7/{valid-standard-1.6.json => valid-standard-1.7.json} | 0
...{valid-standard-1.6.textproto => valid-standard-1.7.textproto} | 0
.../1.7/{valid-standard-1.6.xml => valid-standard-1.7.xml} | 0
.../resources/1.7/{valid-tags-1.6.json => valid-tags-1.7.json} | 0
.../1.7/{valid-tags-1.6.textproto => valid-tags-1.7.textproto} | 0
.../test/resources/1.7/{valid-tags-1.6.xml => valid-tags-1.7.xml} | 0
...{valid-vulnerability-1.6.json => valid-vulnerability-1.7.json} | 0
...nerability-1.6.textproto => valid-vulnerability-1.7.textproto} | 0
.../{valid-vulnerability-1.6.xml => valid-vulnerability-1.7.xml} | 0
.../{valid-xml-signature-1.6.xml => valid-xml-signature-1.7.xml} | 0
188 files changed, 0 insertions(+), 0 deletions(-)
rename tools/src/test/resources/1.7/{invalid-bomformat-1.6.json => invalid-bomformat-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-component-ref-1.6.json => invalid-component-ref-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-component-ref-1.6.xml => invalid-component-ref-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-component-swid-1.6.json => invalid-component-swid-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-component-swid-1.6.xml => invalid-component-swid-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-component-type-1.6.json => invalid-component-type-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-component-type-1.6.xml => invalid-component-type-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-dependency-1.6.json => invalid-dependency-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-dependency-1.6.xml => invalid-dependency-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-empty-component-1.6.json => invalid-empty-component-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-empty-component-1.6.xml => invalid-empty-component-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-hash-alg-1.6.json => invalid-hash-alg-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-hash-alg-1.6.xml => invalid-hash-alg-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-hash-md5-1.6.json => invalid-hash-md5-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-hash-md5-1.6.xml => invalid-hash-md5-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-hash-sha1-1.6.json => invalid-hash-sha1-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-hash-sha1-1.6.xml => invalid-hash-sha1-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-hash-sha256-1.6.json => invalid-hash-sha256-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-hash-sha256-1.6.xml => invalid-hash-sha256-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-hash-sha512-1.6.json => invalid-hash-sha512-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-hash-sha512-1.6.xml => invalid-hash-sha512-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-issue-type-1.6.json => invalid-issue-type-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-issue-type-1.6.xml => invalid-issue-type-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-license-choice-1.6.json => invalid-license-choice-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-license-choice-1.6.xml => invalid-license-choice-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-license-encoding-1.6.json => invalid-license-encoding-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-license-encoding-1.6.xml => invalid-license-encoding-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-license-id-1.6.json => invalid-license-id-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-license-id-1.6.xml => invalid-license-id-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-license-id-count-1.6.xml => invalid-license-id-count-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-license-missing-id-and-name-1.6.json => invalid-license-missing-id-and-name-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-license-missing-id-and-name-1.6.textproto => invalid-license-missing-id-and-name-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{invalid-license-missing-id-and-name-1.6.xml => invalid-license-missing-id-and-name-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-license-name-count-1.6.xml => invalid-license-name-count-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-metadata-license-1.6.json => invalid-metadata-license-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-metadata-license-1.6.xml => invalid-metadata-license-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-metadata-timestamp-1.6.json => invalid-metadata-timestamp-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-metadata-timestamp-1.6.xml => invalid-metadata-timestamp-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-missing-component-type-1.6.json => invalid-missing-component-type-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-missing-component-type-1.6.xml => invalid-missing-component-type-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-namespace-1.6.xml => invalid-namespace-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-patch-type-1.6.json => invalid-patch-type-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-patch-type-1.6.xml => invalid-patch-type-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-properties-1.6.json => invalid-properties-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-properties-1.6.textproto => invalid-properties-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{invalid-properties-1.6.xml => invalid-properties-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-scope-1.6.json => invalid-scope-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-scope-1.6.xml => invalid-scope-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-serialnumber-1.6.json => invalid-serialnumber-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-serialnumber-1.6.xml => invalid-serialnumber-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-service-data-1.6.json => invalid-service-data-1.7.json} (100%)
rename tools/src/test/resources/1.7/{invalid-service-data-1.6.xml => invalid-service-data-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-annotation-1.6.json => valid-annotation-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-annotation-1.6.textproto => valid-annotation-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-annotation-1.6.xml => valid-annotation-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-assembly-1.6.json => valid-assembly-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-assembly-1.6.textproto => valid-assembly-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-assembly-1.6.xml => valid-assembly-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-attestation-1.6.json => valid-attestation-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-attestation-1.6.textproto => valid-attestation-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-attestation-1.6.xml => valid-attestation-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-bom-1.6.json => valid-bom-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-bom-1.6.textproto => valid-bom-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-bom-1.6.xml => valid-bom-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-component-data-1.6.json => valid-component-data-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-component-data-1.6.textproto => valid-component-data-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-component-data-1.6.xml => valid-component-data-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-component-hashes-1.6.json => valid-component-hashes-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-component-hashes-1.6.textproto => valid-component-hashes-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-component-hashes-1.6.xml => valid-component-hashes-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-component-identifiers-1.6.json => valid-component-identifiers-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-component-identifiers-1.6.textproto => valid-component-identifiers-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-component-identifiers-1.6.xml => valid-component-identifiers-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-component-ref-1.6.json => valid-component-ref-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-component-ref-1.6.textproto => valid-component-ref-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-component-ref-1.6.xml => valid-component-ref-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-component-swid-1.6.json => valid-component-swid-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-component-swid-1.6.textproto => valid-component-swid-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-component-swid-1.6.xml => valid-component-swid-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-component-swid-full-1.6.json => valid-component-swid-full-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-component-swid-full-1.6.textproto => valid-component-swid-full-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-component-swid-full-1.6.xml => valid-component-swid-full-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-component-types-1.6.json => valid-component-types-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-component-types-1.6.textproto => valid-component-types-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-component-types-1.6.xml => valid-component-types-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-compositions-1.6.json => valid-compositions-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-compositions-1.6.textproto => valid-compositions-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-compositions-1.6.xml => valid-compositions-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-cryptography-full-1.6.json => valid-cryptography-full-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-cryptography-full-1.6.textproto => valid-cryptography-full-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-cryptography-full-1.6.xml => valid-cryptography-full-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-cryptography-implementation-1.6.json => valid-cryptography-implementation-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-cryptography-implementation-1.6.textproto => valid-cryptography-implementation-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-cryptography-implementation-1.6.xml => valid-cryptography-implementation-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-dependency-1.6.json => valid-dependency-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-dependency-1.6.textproto => valid-dependency-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-dependency-1.6.xml => valid-dependency-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-empty-components-1.6.json => valid-empty-components-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-empty-components-1.6.textproto => valid-empty-components-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-empty-components-1.6.xml => valid-empty-components-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-evidence-1.6.json => valid-evidence-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-evidence-1.6.textproto => valid-evidence-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-evidence-1.6.xml => valid-evidence-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-external-elements-1.6.xml => valid-external-elements-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-external-reference-1.6.json => valid-external-reference-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-external-reference-1.6.textproto => valid-external-reference-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-external-reference-1.6.xml => valid-external-reference-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-formulation-1.6.json => valid-formulation-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-formulation-1.6.textproto => valid-formulation-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-formulation-1.6.xml => valid-formulation-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-license-expression-1.6.json => valid-license-expression-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-license-expression-1.6.textproto => valid-license-expression-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-license-expression-1.6.xml => valid-license-expression-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-license-id-1.6.json => valid-license-id-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-license-id-1.6.textproto => valid-license-id-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-license-id-1.6.xml => valid-license-id-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-license-licensing-1.6.json => valid-license-licensing-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-license-licensing-1.6.textproto => valid-license-licensing-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-license-licensing-1.6.xml => valid-license-licensing-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-license-name-1.6.json => valid-license-name-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-license-name-1.6.textproto => valid-license-name-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-license-name-1.6.xml => valid-license-name-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-machine-learning-1.6.json => valid-machine-learning-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-machine-learning-1.6.textproto => valid-machine-learning-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-machine-learning-1.6.xml => valid-machine-learning-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-machine-learning-considerations-env-1.6.json => valid-machine-learning-considerations-env-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-machine-learning-considerations-env-1.6.textproto => valid-machine-learning-considerations-env-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-machine-learning-considerations-env-1.6.xml => valid-machine-learning-considerations-env-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-author-1.6.json => valid-metadata-author-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-author-1.6.textproto => valid-metadata-author-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-author-1.6.xml => valid-metadata-author-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-license-1.6.json => valid-metadata-license-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-license-1.6.textproto => valid-metadata-license-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-license-1.6.xml => valid-metadata-license-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-lifecycle-1.6.json => valid-metadata-lifecycle-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-lifecycle-1.6.textproto => valid-metadata-lifecycle-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-lifecycle-1.6.xml => valid-metadata-lifecycle-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-manufacture-1.6.json => valid-metadata-manufacture-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-manufacture-1.6.textproto => valid-metadata-manufacture-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-manufacture-1.6.xml => valid-metadata-manufacture-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-manufacturer-1.6.json => valid-metadata-manufacturer-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-manufacturer-1.6.textproto => valid-metadata-manufacturer-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-manufacturer-1.6.xml => valid-metadata-manufacturer-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-supplier-1.6.json => valid-metadata-supplier-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-supplier-1.6.textproto => valid-metadata-supplier-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-supplier-1.6.xml => valid-metadata-supplier-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-timestamp-1.6.json => valid-metadata-timestamp-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-timestamp-1.6.textproto => valid-metadata-timestamp-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-timestamp-1.6.xml => valid-metadata-timestamp-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-tool-1.6.json => valid-metadata-tool-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-tool-1.6.textproto => valid-metadata-tool-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-tool-1.6.xml => valid-metadata-tool-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-tool-deprecated-1.6.json => valid-metadata-tool-deprecated-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-tool-deprecated-1.6.textproto => valid-metadata-tool-deprecated-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-metadata-tool-deprecated-1.6.xml => valid-metadata-tool-deprecated-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-minimal-viable-1.6.json => valid-minimal-viable-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-minimal-viable-1.6.textproto => valid-minimal-viable-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-minimal-viable-1.6.xml => valid-minimal-viable-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-patch-1.6.json => valid-patch-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-patch-1.6.textproto => valid-patch-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-patch-1.6.xml => valid-patch-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-properties-1.6.json => valid-properties-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-properties-1.6.textproto => valid-properties-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-properties-1.6.xml => valid-properties-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-random-attributes-1.6.xml => valid-random-attributes-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-release-notes-1.6.json => valid-release-notes-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-release-notes-1.6.textproto => valid-release-notes-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-release-notes-1.6.xml => valid-release-notes-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-saasbom-1.6.json => valid-saasbom-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-saasbom-1.6.textproto => valid-saasbom-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-saasbom-1.6.xml => valid-saasbom-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-service-1.6.json => valid-service-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-service-1.6.textproto => valid-service-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-service-1.6.xml => valid-service-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-service-empty-objects-1.6.json => valid-service-empty-objects-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-service-empty-objects-1.6.textproto => valid-service-empty-objects-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-service-empty-objects-1.6.xml => valid-service-empty-objects-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-signatures-1.6.json => valid-signatures-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-standard-1.6.json => valid-standard-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-standard-1.6.textproto => valid-standard-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-standard-1.6.xml => valid-standard-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-tags-1.6.json => valid-tags-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-tags-1.6.textproto => valid-tags-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-tags-1.6.xml => valid-tags-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-vulnerability-1.6.json => valid-vulnerability-1.7.json} (100%)
rename tools/src/test/resources/1.7/{valid-vulnerability-1.6.textproto => valid-vulnerability-1.7.textproto} (100%)
rename tools/src/test/resources/1.7/{valid-vulnerability-1.6.xml => valid-vulnerability-1.7.xml} (100%)
rename tools/src/test/resources/1.7/{valid-xml-signature-1.6.xml => valid-xml-signature-1.7.xml} (100%)
diff --git a/tools/src/test/resources/1.7/invalid-bomformat-1.6.json b/tools/src/test/resources/1.7/invalid-bomformat-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-bomformat-1.6.json
rename to tools/src/test/resources/1.7/invalid-bomformat-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-component-ref-1.6.json b/tools/src/test/resources/1.7/invalid-component-ref-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-component-ref-1.6.json
rename to tools/src/test/resources/1.7/invalid-component-ref-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-component-ref-1.6.xml b/tools/src/test/resources/1.7/invalid-component-ref-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-component-ref-1.6.xml
rename to tools/src/test/resources/1.7/invalid-component-ref-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-component-swid-1.6.json b/tools/src/test/resources/1.7/invalid-component-swid-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-component-swid-1.6.json
rename to tools/src/test/resources/1.7/invalid-component-swid-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-component-swid-1.6.xml b/tools/src/test/resources/1.7/invalid-component-swid-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-component-swid-1.6.xml
rename to tools/src/test/resources/1.7/invalid-component-swid-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-component-type-1.6.json b/tools/src/test/resources/1.7/invalid-component-type-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-component-type-1.6.json
rename to tools/src/test/resources/1.7/invalid-component-type-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-component-type-1.6.xml b/tools/src/test/resources/1.7/invalid-component-type-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-component-type-1.6.xml
rename to tools/src/test/resources/1.7/invalid-component-type-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-dependency-1.6.json b/tools/src/test/resources/1.7/invalid-dependency-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-dependency-1.6.json
rename to tools/src/test/resources/1.7/invalid-dependency-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-dependency-1.6.xml b/tools/src/test/resources/1.7/invalid-dependency-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-dependency-1.6.xml
rename to tools/src/test/resources/1.7/invalid-dependency-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-empty-component-1.6.json b/tools/src/test/resources/1.7/invalid-empty-component-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-empty-component-1.6.json
rename to tools/src/test/resources/1.7/invalid-empty-component-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-empty-component-1.6.xml b/tools/src/test/resources/1.7/invalid-empty-component-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-empty-component-1.6.xml
rename to tools/src/test/resources/1.7/invalid-empty-component-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-hash-alg-1.6.json b/tools/src/test/resources/1.7/invalid-hash-alg-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-hash-alg-1.6.json
rename to tools/src/test/resources/1.7/invalid-hash-alg-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-hash-alg-1.6.xml b/tools/src/test/resources/1.7/invalid-hash-alg-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-hash-alg-1.6.xml
rename to tools/src/test/resources/1.7/invalid-hash-alg-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-hash-md5-1.6.json b/tools/src/test/resources/1.7/invalid-hash-md5-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-hash-md5-1.6.json
rename to tools/src/test/resources/1.7/invalid-hash-md5-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-hash-md5-1.6.xml b/tools/src/test/resources/1.7/invalid-hash-md5-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-hash-md5-1.6.xml
rename to tools/src/test/resources/1.7/invalid-hash-md5-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha1-1.6.json b/tools/src/test/resources/1.7/invalid-hash-sha1-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-hash-sha1-1.6.json
rename to tools/src/test/resources/1.7/invalid-hash-sha1-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha1-1.6.xml b/tools/src/test/resources/1.7/invalid-hash-sha1-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-hash-sha1-1.6.xml
rename to tools/src/test/resources/1.7/invalid-hash-sha1-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha256-1.6.json b/tools/src/test/resources/1.7/invalid-hash-sha256-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-hash-sha256-1.6.json
rename to tools/src/test/resources/1.7/invalid-hash-sha256-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha256-1.6.xml b/tools/src/test/resources/1.7/invalid-hash-sha256-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-hash-sha256-1.6.xml
rename to tools/src/test/resources/1.7/invalid-hash-sha256-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha512-1.6.json b/tools/src/test/resources/1.7/invalid-hash-sha512-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-hash-sha512-1.6.json
rename to tools/src/test/resources/1.7/invalid-hash-sha512-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha512-1.6.xml b/tools/src/test/resources/1.7/invalid-hash-sha512-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-hash-sha512-1.6.xml
rename to tools/src/test/resources/1.7/invalid-hash-sha512-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-issue-type-1.6.json b/tools/src/test/resources/1.7/invalid-issue-type-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-issue-type-1.6.json
rename to tools/src/test/resources/1.7/invalid-issue-type-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-issue-type-1.6.xml b/tools/src/test/resources/1.7/invalid-issue-type-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-issue-type-1.6.xml
rename to tools/src/test/resources/1.7/invalid-issue-type-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-license-choice-1.6.json b/tools/src/test/resources/1.7/invalid-license-choice-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-license-choice-1.6.json
rename to tools/src/test/resources/1.7/invalid-license-choice-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-license-choice-1.6.xml b/tools/src/test/resources/1.7/invalid-license-choice-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-license-choice-1.6.xml
rename to tools/src/test/resources/1.7/invalid-license-choice-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-license-encoding-1.6.json b/tools/src/test/resources/1.7/invalid-license-encoding-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-license-encoding-1.6.json
rename to tools/src/test/resources/1.7/invalid-license-encoding-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-license-encoding-1.6.xml b/tools/src/test/resources/1.7/invalid-license-encoding-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-license-encoding-1.6.xml
rename to tools/src/test/resources/1.7/invalid-license-encoding-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-license-id-1.6.json b/tools/src/test/resources/1.7/invalid-license-id-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-license-id-1.6.json
rename to tools/src/test/resources/1.7/invalid-license-id-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-license-id-1.6.xml b/tools/src/test/resources/1.7/invalid-license-id-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-license-id-1.6.xml
rename to tools/src/test/resources/1.7/invalid-license-id-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-license-id-count-1.6.xml b/tools/src/test/resources/1.7/invalid-license-id-count-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-license-id-count-1.6.xml
rename to tools/src/test/resources/1.7/invalid-license-id-count-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.json b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.json
rename to tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.textproto b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.textproto
rename to tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.textproto
diff --git a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.xml b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.6.xml
rename to tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-license-name-count-1.6.xml b/tools/src/test/resources/1.7/invalid-license-name-count-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-license-name-count-1.6.xml
rename to tools/src/test/resources/1.7/invalid-license-name-count-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-metadata-license-1.6.json b/tools/src/test/resources/1.7/invalid-metadata-license-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-metadata-license-1.6.json
rename to tools/src/test/resources/1.7/invalid-metadata-license-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-metadata-license-1.6.xml b/tools/src/test/resources/1.7/invalid-metadata-license-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-metadata-license-1.6.xml
rename to tools/src/test/resources/1.7/invalid-metadata-license-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.json b/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.json
rename to tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.xml b/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-metadata-timestamp-1.6.xml
rename to tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-missing-component-type-1.6.json b/tools/src/test/resources/1.7/invalid-missing-component-type-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-missing-component-type-1.6.json
rename to tools/src/test/resources/1.7/invalid-missing-component-type-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-missing-component-type-1.6.xml b/tools/src/test/resources/1.7/invalid-missing-component-type-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-missing-component-type-1.6.xml
rename to tools/src/test/resources/1.7/invalid-missing-component-type-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-namespace-1.6.xml b/tools/src/test/resources/1.7/invalid-namespace-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-namespace-1.6.xml
rename to tools/src/test/resources/1.7/invalid-namespace-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-patch-type-1.6.json b/tools/src/test/resources/1.7/invalid-patch-type-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-patch-type-1.6.json
rename to tools/src/test/resources/1.7/invalid-patch-type-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-patch-type-1.6.xml b/tools/src/test/resources/1.7/invalid-patch-type-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-patch-type-1.6.xml
rename to tools/src/test/resources/1.7/invalid-patch-type-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-properties-1.6.json b/tools/src/test/resources/1.7/invalid-properties-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-properties-1.6.json
rename to tools/src/test/resources/1.7/invalid-properties-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-properties-1.6.textproto b/tools/src/test/resources/1.7/invalid-properties-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-properties-1.6.textproto
rename to tools/src/test/resources/1.7/invalid-properties-1.7.textproto
diff --git a/tools/src/test/resources/1.7/invalid-properties-1.6.xml b/tools/src/test/resources/1.7/invalid-properties-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-properties-1.6.xml
rename to tools/src/test/resources/1.7/invalid-properties-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-scope-1.6.json b/tools/src/test/resources/1.7/invalid-scope-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-scope-1.6.json
rename to tools/src/test/resources/1.7/invalid-scope-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-scope-1.6.xml b/tools/src/test/resources/1.7/invalid-scope-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-scope-1.6.xml
rename to tools/src/test/resources/1.7/invalid-scope-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-serialnumber-1.6.json b/tools/src/test/resources/1.7/invalid-serialnumber-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-serialnumber-1.6.json
rename to tools/src/test/resources/1.7/invalid-serialnumber-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-serialnumber-1.6.xml b/tools/src/test/resources/1.7/invalid-serialnumber-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-serialnumber-1.6.xml
rename to tools/src/test/resources/1.7/invalid-serialnumber-1.7.xml
diff --git a/tools/src/test/resources/1.7/invalid-service-data-1.6.json b/tools/src/test/resources/1.7/invalid-service-data-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-service-data-1.6.json
rename to tools/src/test/resources/1.7/invalid-service-data-1.7.json
diff --git a/tools/src/test/resources/1.7/invalid-service-data-1.6.xml b/tools/src/test/resources/1.7/invalid-service-data-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-service-data-1.6.xml
rename to tools/src/test/resources/1.7/invalid-service-data-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-annotation-1.6.json b/tools/src/test/resources/1.7/valid-annotation-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-annotation-1.6.json
rename to tools/src/test/resources/1.7/valid-annotation-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-annotation-1.6.textproto b/tools/src/test/resources/1.7/valid-annotation-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-annotation-1.6.textproto
rename to tools/src/test/resources/1.7/valid-annotation-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-annotation-1.6.xml b/tools/src/test/resources/1.7/valid-annotation-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-annotation-1.6.xml
rename to tools/src/test/resources/1.7/valid-annotation-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-assembly-1.6.json b/tools/src/test/resources/1.7/valid-assembly-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-assembly-1.6.json
rename to tools/src/test/resources/1.7/valid-assembly-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-assembly-1.6.textproto b/tools/src/test/resources/1.7/valid-assembly-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-assembly-1.6.textproto
rename to tools/src/test/resources/1.7/valid-assembly-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-assembly-1.6.xml b/tools/src/test/resources/1.7/valid-assembly-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-assembly-1.6.xml
rename to tools/src/test/resources/1.7/valid-assembly-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-attestation-1.6.json b/tools/src/test/resources/1.7/valid-attestation-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-attestation-1.6.json
rename to tools/src/test/resources/1.7/valid-attestation-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-attestation-1.6.textproto b/tools/src/test/resources/1.7/valid-attestation-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-attestation-1.6.textproto
rename to tools/src/test/resources/1.7/valid-attestation-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-attestation-1.6.xml b/tools/src/test/resources/1.7/valid-attestation-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-attestation-1.6.xml
rename to tools/src/test/resources/1.7/valid-attestation-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-bom-1.6.json b/tools/src/test/resources/1.7/valid-bom-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-bom-1.6.json
rename to tools/src/test/resources/1.7/valid-bom-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-bom-1.6.textproto b/tools/src/test/resources/1.7/valid-bom-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-bom-1.6.textproto
rename to tools/src/test/resources/1.7/valid-bom-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-bom-1.6.xml b/tools/src/test/resources/1.7/valid-bom-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-bom-1.6.xml
rename to tools/src/test/resources/1.7/valid-bom-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-component-data-1.6.json b/tools/src/test/resources/1.7/valid-component-data-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-data-1.6.json
rename to tools/src/test/resources/1.7/valid-component-data-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-component-data-1.6.textproto b/tools/src/test/resources/1.7/valid-component-data-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-data-1.6.textproto
rename to tools/src/test/resources/1.7/valid-component-data-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-component-data-1.6.xml b/tools/src/test/resources/1.7/valid-component-data-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-data-1.6.xml
rename to tools/src/test/resources/1.7/valid-component-data-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-component-hashes-1.6.json b/tools/src/test/resources/1.7/valid-component-hashes-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-hashes-1.6.json
rename to tools/src/test/resources/1.7/valid-component-hashes-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-component-hashes-1.6.textproto b/tools/src/test/resources/1.7/valid-component-hashes-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-hashes-1.6.textproto
rename to tools/src/test/resources/1.7/valid-component-hashes-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-component-hashes-1.6.xml b/tools/src/test/resources/1.7/valid-component-hashes-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-hashes-1.6.xml
rename to tools/src/test/resources/1.7/valid-component-hashes-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-component-identifiers-1.6.json b/tools/src/test/resources/1.7/valid-component-identifiers-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-identifiers-1.6.json
rename to tools/src/test/resources/1.7/valid-component-identifiers-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-component-identifiers-1.6.textproto b/tools/src/test/resources/1.7/valid-component-identifiers-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-identifiers-1.6.textproto
rename to tools/src/test/resources/1.7/valid-component-identifiers-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-component-identifiers-1.6.xml b/tools/src/test/resources/1.7/valid-component-identifiers-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-identifiers-1.6.xml
rename to tools/src/test/resources/1.7/valid-component-identifiers-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-component-ref-1.6.json b/tools/src/test/resources/1.7/valid-component-ref-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-ref-1.6.json
rename to tools/src/test/resources/1.7/valid-component-ref-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-component-ref-1.6.textproto b/tools/src/test/resources/1.7/valid-component-ref-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-ref-1.6.textproto
rename to tools/src/test/resources/1.7/valid-component-ref-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-component-ref-1.6.xml b/tools/src/test/resources/1.7/valid-component-ref-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-ref-1.6.xml
rename to tools/src/test/resources/1.7/valid-component-ref-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-component-swid-1.6.json b/tools/src/test/resources/1.7/valid-component-swid-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-swid-1.6.json
rename to tools/src/test/resources/1.7/valid-component-swid-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-component-swid-1.6.textproto b/tools/src/test/resources/1.7/valid-component-swid-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-swid-1.6.textproto
rename to tools/src/test/resources/1.7/valid-component-swid-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-component-swid-1.6.xml b/tools/src/test/resources/1.7/valid-component-swid-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-swid-1.6.xml
rename to tools/src/test/resources/1.7/valid-component-swid-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-component-swid-full-1.6.json b/tools/src/test/resources/1.7/valid-component-swid-full-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-swid-full-1.6.json
rename to tools/src/test/resources/1.7/valid-component-swid-full-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-component-swid-full-1.6.textproto b/tools/src/test/resources/1.7/valid-component-swid-full-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-swid-full-1.6.textproto
rename to tools/src/test/resources/1.7/valid-component-swid-full-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-component-swid-full-1.6.xml b/tools/src/test/resources/1.7/valid-component-swid-full-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-swid-full-1.6.xml
rename to tools/src/test/resources/1.7/valid-component-swid-full-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-component-types-1.6.json b/tools/src/test/resources/1.7/valid-component-types-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-types-1.6.json
rename to tools/src/test/resources/1.7/valid-component-types-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-component-types-1.6.textproto b/tools/src/test/resources/1.7/valid-component-types-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-types-1.6.textproto
rename to tools/src/test/resources/1.7/valid-component-types-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-component-types-1.6.xml b/tools/src/test/resources/1.7/valid-component-types-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-component-types-1.6.xml
rename to tools/src/test/resources/1.7/valid-component-types-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-compositions-1.6.json b/tools/src/test/resources/1.7/valid-compositions-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-compositions-1.6.json
rename to tools/src/test/resources/1.7/valid-compositions-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-compositions-1.6.textproto b/tools/src/test/resources/1.7/valid-compositions-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-compositions-1.6.textproto
rename to tools/src/test/resources/1.7/valid-compositions-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-compositions-1.6.xml b/tools/src/test/resources/1.7/valid-compositions-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-compositions-1.6.xml
rename to tools/src/test/resources/1.7/valid-compositions-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-cryptography-full-1.6.json b/tools/src/test/resources/1.7/valid-cryptography-full-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-cryptography-full-1.6.json
rename to tools/src/test/resources/1.7/valid-cryptography-full-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-cryptography-full-1.6.textproto b/tools/src/test/resources/1.7/valid-cryptography-full-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-cryptography-full-1.6.textproto
rename to tools/src/test/resources/1.7/valid-cryptography-full-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-cryptography-full-1.6.xml b/tools/src/test/resources/1.7/valid-cryptography-full-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-cryptography-full-1.6.xml
rename to tools/src/test/resources/1.7/valid-cryptography-full-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.json b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.json
rename to tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.textproto b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.textproto
rename to tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.xml b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-cryptography-implementation-1.6.xml
rename to tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-dependency-1.6.json b/tools/src/test/resources/1.7/valid-dependency-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-dependency-1.6.json
rename to tools/src/test/resources/1.7/valid-dependency-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-dependency-1.6.textproto b/tools/src/test/resources/1.7/valid-dependency-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-dependency-1.6.textproto
rename to tools/src/test/resources/1.7/valid-dependency-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-dependency-1.6.xml b/tools/src/test/resources/1.7/valid-dependency-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-dependency-1.6.xml
rename to tools/src/test/resources/1.7/valid-dependency-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-empty-components-1.6.json b/tools/src/test/resources/1.7/valid-empty-components-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-empty-components-1.6.json
rename to tools/src/test/resources/1.7/valid-empty-components-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-empty-components-1.6.textproto b/tools/src/test/resources/1.7/valid-empty-components-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-empty-components-1.6.textproto
rename to tools/src/test/resources/1.7/valid-empty-components-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-empty-components-1.6.xml b/tools/src/test/resources/1.7/valid-empty-components-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-empty-components-1.6.xml
rename to tools/src/test/resources/1.7/valid-empty-components-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-evidence-1.6.json b/tools/src/test/resources/1.7/valid-evidence-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-evidence-1.6.json
rename to tools/src/test/resources/1.7/valid-evidence-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-evidence-1.6.textproto b/tools/src/test/resources/1.7/valid-evidence-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-evidence-1.6.textproto
rename to tools/src/test/resources/1.7/valid-evidence-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-evidence-1.6.xml b/tools/src/test/resources/1.7/valid-evidence-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-evidence-1.6.xml
rename to tools/src/test/resources/1.7/valid-evidence-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-external-elements-1.6.xml b/tools/src/test/resources/1.7/valid-external-elements-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-external-elements-1.6.xml
rename to tools/src/test/resources/1.7/valid-external-elements-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-external-reference-1.6.json b/tools/src/test/resources/1.7/valid-external-reference-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-external-reference-1.6.json
rename to tools/src/test/resources/1.7/valid-external-reference-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-external-reference-1.6.textproto b/tools/src/test/resources/1.7/valid-external-reference-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-external-reference-1.6.textproto
rename to tools/src/test/resources/1.7/valid-external-reference-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-external-reference-1.6.xml b/tools/src/test/resources/1.7/valid-external-reference-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-external-reference-1.6.xml
rename to tools/src/test/resources/1.7/valid-external-reference-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-formulation-1.6.json b/tools/src/test/resources/1.7/valid-formulation-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-formulation-1.6.json
rename to tools/src/test/resources/1.7/valid-formulation-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-formulation-1.6.textproto b/tools/src/test/resources/1.7/valid-formulation-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-formulation-1.6.textproto
rename to tools/src/test/resources/1.7/valid-formulation-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-formulation-1.6.xml b/tools/src/test/resources/1.7/valid-formulation-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-formulation-1.6.xml
rename to tools/src/test/resources/1.7/valid-formulation-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.6.json b/tools/src/test/resources/1.7/valid-license-expression-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-expression-1.6.json
rename to tools/src/test/resources/1.7/valid-license-expression-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.6.textproto b/tools/src/test/resources/1.7/valid-license-expression-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-expression-1.6.textproto
rename to tools/src/test/resources/1.7/valid-license-expression-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.6.xml b/tools/src/test/resources/1.7/valid-license-expression-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-expression-1.6.xml
rename to tools/src/test/resources/1.7/valid-license-expression-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.6.json b/tools/src/test/resources/1.7/valid-license-id-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-id-1.6.json
rename to tools/src/test/resources/1.7/valid-license-id-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.6.textproto b/tools/src/test/resources/1.7/valid-license-id-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-id-1.6.textproto
rename to tools/src/test/resources/1.7/valid-license-id-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.6.xml b/tools/src/test/resources/1.7/valid-license-id-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-id-1.6.xml
rename to tools/src/test/resources/1.7/valid-license-id-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-license-licensing-1.6.json b/tools/src/test/resources/1.7/valid-license-licensing-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-licensing-1.6.json
rename to tools/src/test/resources/1.7/valid-license-licensing-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-license-licensing-1.6.textproto b/tools/src/test/resources/1.7/valid-license-licensing-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-licensing-1.6.textproto
rename to tools/src/test/resources/1.7/valid-license-licensing-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-license-licensing-1.6.xml b/tools/src/test/resources/1.7/valid-license-licensing-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-licensing-1.6.xml
rename to tools/src/test/resources/1.7/valid-license-licensing-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.6.json b/tools/src/test/resources/1.7/valid-license-name-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-name-1.6.json
rename to tools/src/test/resources/1.7/valid-license-name-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.6.textproto b/tools/src/test/resources/1.7/valid-license-name-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-name-1.6.textproto
rename to tools/src/test/resources/1.7/valid-license-name-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.6.xml b/tools/src/test/resources/1.7/valid-license-name-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-license-name-1.6.xml
rename to tools/src/test/resources/1.7/valid-license-name-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.6.json b/tools/src/test/resources/1.7/valid-machine-learning-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-machine-learning-1.6.json
rename to tools/src/test/resources/1.7/valid-machine-learning-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.6.textproto b/tools/src/test/resources/1.7/valid-machine-learning-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-machine-learning-1.6.textproto
rename to tools/src/test/resources/1.7/valid-machine-learning-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.6.xml b/tools/src/test/resources/1.7/valid-machine-learning-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-machine-learning-1.6.xml
rename to tools/src/test/resources/1.7/valid-machine-learning-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.json b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.json
rename to tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.textproto b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.textproto
rename to tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.xml b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.6.xml
rename to tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-metadata-author-1.6.json b/tools/src/test/resources/1.7/valid-metadata-author-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-author-1.6.json
rename to tools/src/test/resources/1.7/valid-metadata-author-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-metadata-author-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-author-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-author-1.6.textproto
rename to tools/src/test/resources/1.7/valid-metadata-author-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-metadata-author-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-author-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-author-1.6.xml
rename to tools/src/test/resources/1.7/valid-metadata-author-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-metadata-license-1.6.json b/tools/src/test/resources/1.7/valid-metadata-license-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-license-1.6.json
rename to tools/src/test/resources/1.7/valid-metadata-license-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-metadata-license-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-license-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-license-1.6.textproto
rename to tools/src/test/resources/1.7/valid-metadata-license-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-metadata-license-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-license-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-license-1.6.xml
rename to tools/src/test/resources/1.7/valid-metadata-license-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.json b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.json
rename to tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.textproto
rename to tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-lifecycle-1.6.xml
rename to tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.json b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.json
rename to tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.textproto
rename to tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-manufacture-1.6.xml
rename to tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.json b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.json
rename to tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.textproto
rename to tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-manufacturer-1.6.xml
rename to tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.json b/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-supplier-1.6.json
rename to tools/src/test/resources/1.7/valid-metadata-supplier-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-supplier-1.6.textproto
rename to tools/src/test/resources/1.7/valid-metadata-supplier-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-metadata-supplier-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-supplier-1.6.xml
rename to tools/src/test/resources/1.7/valid-metadata-supplier-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.json b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.json
rename to tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.textproto
rename to tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-timestamp-1.6.xml
rename to tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-1.6.json b/tools/src/test/resources/1.7/valid-metadata-tool-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-tool-1.6.json
rename to tools/src/test/resources/1.7/valid-metadata-tool-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-tool-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-tool-1.6.textproto
rename to tools/src/test/resources/1.7/valid-metadata-tool-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-tool-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-tool-1.6.xml
rename to tools/src/test/resources/1.7/valid-metadata-tool-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.json b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.json
rename to tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.textproto b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.textproto
rename to tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.xml b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.6.xml
rename to tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-minimal-viable-1.6.json b/tools/src/test/resources/1.7/valid-minimal-viable-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-minimal-viable-1.6.json
rename to tools/src/test/resources/1.7/valid-minimal-viable-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-minimal-viable-1.6.textproto b/tools/src/test/resources/1.7/valid-minimal-viable-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-minimal-viable-1.6.textproto
rename to tools/src/test/resources/1.7/valid-minimal-viable-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-minimal-viable-1.6.xml b/tools/src/test/resources/1.7/valid-minimal-viable-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-minimal-viable-1.6.xml
rename to tools/src/test/resources/1.7/valid-minimal-viable-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-patch-1.6.json b/tools/src/test/resources/1.7/valid-patch-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-patch-1.6.json
rename to tools/src/test/resources/1.7/valid-patch-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-patch-1.6.textproto b/tools/src/test/resources/1.7/valid-patch-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-patch-1.6.textproto
rename to tools/src/test/resources/1.7/valid-patch-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-patch-1.6.xml b/tools/src/test/resources/1.7/valid-patch-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-patch-1.6.xml
rename to tools/src/test/resources/1.7/valid-patch-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-properties-1.6.json b/tools/src/test/resources/1.7/valid-properties-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-properties-1.6.json
rename to tools/src/test/resources/1.7/valid-properties-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-properties-1.6.textproto b/tools/src/test/resources/1.7/valid-properties-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-properties-1.6.textproto
rename to tools/src/test/resources/1.7/valid-properties-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-properties-1.6.xml b/tools/src/test/resources/1.7/valid-properties-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-properties-1.6.xml
rename to tools/src/test/resources/1.7/valid-properties-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-random-attributes-1.6.xml b/tools/src/test/resources/1.7/valid-random-attributes-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-random-attributes-1.6.xml
rename to tools/src/test/resources/1.7/valid-random-attributes-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-release-notes-1.6.json b/tools/src/test/resources/1.7/valid-release-notes-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-release-notes-1.6.json
rename to tools/src/test/resources/1.7/valid-release-notes-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-release-notes-1.6.textproto b/tools/src/test/resources/1.7/valid-release-notes-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-release-notes-1.6.textproto
rename to tools/src/test/resources/1.7/valid-release-notes-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-release-notes-1.6.xml b/tools/src/test/resources/1.7/valid-release-notes-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-release-notes-1.6.xml
rename to tools/src/test/resources/1.7/valid-release-notes-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-saasbom-1.6.json b/tools/src/test/resources/1.7/valid-saasbom-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-saasbom-1.6.json
rename to tools/src/test/resources/1.7/valid-saasbom-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-saasbom-1.6.textproto b/tools/src/test/resources/1.7/valid-saasbom-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-saasbom-1.6.textproto
rename to tools/src/test/resources/1.7/valid-saasbom-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-saasbom-1.6.xml b/tools/src/test/resources/1.7/valid-saasbom-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-saasbom-1.6.xml
rename to tools/src/test/resources/1.7/valid-saasbom-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-service-1.6.json b/tools/src/test/resources/1.7/valid-service-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-service-1.6.json
rename to tools/src/test/resources/1.7/valid-service-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-service-1.6.textproto b/tools/src/test/resources/1.7/valid-service-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-service-1.6.textproto
rename to tools/src/test/resources/1.7/valid-service-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-service-1.6.xml b/tools/src/test/resources/1.7/valid-service-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-service-1.6.xml
rename to tools/src/test/resources/1.7/valid-service-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.json b/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-service-empty-objects-1.6.json
rename to tools/src/test/resources/1.7/valid-service-empty-objects-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.textproto b/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-service-empty-objects-1.6.textproto
rename to tools/src/test/resources/1.7/valid-service-empty-objects-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-service-empty-objects-1.6.xml b/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-service-empty-objects-1.6.xml
rename to tools/src/test/resources/1.7/valid-service-empty-objects-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-signatures-1.6.json b/tools/src/test/resources/1.7/valid-signatures-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-signatures-1.6.json
rename to tools/src/test/resources/1.7/valid-signatures-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-standard-1.6.json b/tools/src/test/resources/1.7/valid-standard-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-standard-1.6.json
rename to tools/src/test/resources/1.7/valid-standard-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-standard-1.6.textproto b/tools/src/test/resources/1.7/valid-standard-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-standard-1.6.textproto
rename to tools/src/test/resources/1.7/valid-standard-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-standard-1.6.xml b/tools/src/test/resources/1.7/valid-standard-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-standard-1.6.xml
rename to tools/src/test/resources/1.7/valid-standard-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-tags-1.6.json b/tools/src/test/resources/1.7/valid-tags-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-tags-1.6.json
rename to tools/src/test/resources/1.7/valid-tags-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-tags-1.6.textproto b/tools/src/test/resources/1.7/valid-tags-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-tags-1.6.textproto
rename to tools/src/test/resources/1.7/valid-tags-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-tags-1.6.xml b/tools/src/test/resources/1.7/valid-tags-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-tags-1.6.xml
rename to tools/src/test/resources/1.7/valid-tags-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-vulnerability-1.6.json b/tools/src/test/resources/1.7/valid-vulnerability-1.7.json
similarity index 100%
rename from tools/src/test/resources/1.7/valid-vulnerability-1.6.json
rename to tools/src/test/resources/1.7/valid-vulnerability-1.7.json
diff --git a/tools/src/test/resources/1.7/valid-vulnerability-1.6.textproto b/tools/src/test/resources/1.7/valid-vulnerability-1.7.textproto
similarity index 100%
rename from tools/src/test/resources/1.7/valid-vulnerability-1.6.textproto
rename to tools/src/test/resources/1.7/valid-vulnerability-1.7.textproto
diff --git a/tools/src/test/resources/1.7/valid-vulnerability-1.6.xml b/tools/src/test/resources/1.7/valid-vulnerability-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-vulnerability-1.6.xml
rename to tools/src/test/resources/1.7/valid-vulnerability-1.7.xml
diff --git a/tools/src/test/resources/1.7/valid-xml-signature-1.6.xml b/tools/src/test/resources/1.7/valid-xml-signature-1.7.xml
similarity index 100%
rename from tools/src/test/resources/1.7/valid-xml-signature-1.6.xml
rename to tools/src/test/resources/1.7/valid-xml-signature-1.7.xml
From 6262459e29e273c215f9e0c2b6b58922c885bc13 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Wed, 22 Jan 2025 09:51:11 +0100
Subject: [PATCH 13/42] tests: migrate tests for 1.7
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
.../test/resources/1.7/invalid-bomformat-1.7.json | 4 ++--
.../resources/1.7/invalid-component-ref-1.7.json | 4 ++--
.../test/resources/1.7/invalid-component-ref-1.7.xml | 2 +-
.../resources/1.7/invalid-component-swid-1.7.json | 4 ++--
.../resources/1.7/invalid-component-swid-1.7.xml | 2 +-
.../resources/1.7/invalid-component-type-1.7.json | 4 ++--
.../resources/1.7/invalid-component-type-1.7.xml | 2 +-
.../test/resources/1.7/invalid-dependency-1.7.json | 4 ++--
.../test/resources/1.7/invalid-dependency-1.7.xml | 2 +-
.../resources/1.7/invalid-empty-component-1.7.json | 4 ++--
.../resources/1.7/invalid-empty-component-1.7.xml | 2 +-
.../src/test/resources/1.7/invalid-hash-alg-1.7.json | 4 ++--
.../src/test/resources/1.7/invalid-hash-alg-1.7.xml | 2 +-
.../src/test/resources/1.7/invalid-hash-md5-1.7.json | 4 ++--
.../src/test/resources/1.7/invalid-hash-md5-1.7.xml | 2 +-
.../test/resources/1.7/invalid-hash-sha1-1.7.json | 4 ++--
.../src/test/resources/1.7/invalid-hash-sha1-1.7.xml | 2 +-
.../test/resources/1.7/invalid-hash-sha256-1.7.json | 4 ++--
.../test/resources/1.7/invalid-hash-sha256-1.7.xml | 2 +-
.../test/resources/1.7/invalid-hash-sha512-1.7.json | 4 ++--
.../test/resources/1.7/invalid-hash-sha512-1.7.xml | 2 +-
.../test/resources/1.7/invalid-issue-type-1.7.json | 4 ++--
.../test/resources/1.7/invalid-issue-type-1.7.xml | 2 +-
.../resources/1.7/invalid-license-choice-1.7.json | 4 ++--
.../resources/1.7/invalid-license-choice-1.7.xml | 2 +-
.../resources/1.7/invalid-license-encoding-1.7.json | 4 ++--
.../resources/1.7/invalid-license-encoding-1.7.xml | 2 +-
.../test/resources/1.7/invalid-license-id-1.7.json | 4 ++--
.../test/resources/1.7/invalid-license-id-1.7.xml | 2 +-
.../resources/1.7/invalid-license-id-count-1.7.xml | 2 +-
.../1.7/invalid-license-missing-id-and-name-1.7.json | 4 ++--
...invalid-license-missing-id-and-name-1.7.textproto | 6 +++---
.../1.7/invalid-license-missing-id-and-name-1.7.xml | 4 ++--
.../resources/1.7/invalid-license-name-count-1.7.xml | 2 +-
.../resources/1.7/invalid-metadata-license-1.7.json | 4 ++--
.../resources/1.7/invalid-metadata-license-1.7.xml | 4 ++--
.../1.7/invalid-metadata-timestamp-1.7.json | 4 ++--
.../resources/1.7/invalid-metadata-timestamp-1.7.xml | 2 +-
.../1.7/invalid-missing-component-type-1.7.json | 4 ++--
.../1.7/invalid-missing-component-type-1.7.xml | 2 +-
.../test/resources/1.7/invalid-patch-type-1.7.json | 4 ++--
.../test/resources/1.7/invalid-patch-type-1.7.xml | 2 +-
.../test/resources/1.7/invalid-properties-1.7.json | 4 ++--
.../resources/1.7/invalid-properties-1.7.textproto | 4 ++--
.../test/resources/1.7/invalid-properties-1.7.xml | 2 +-
tools/src/test/resources/1.7/invalid-scope-1.7.json | 4 ++--
tools/src/test/resources/1.7/invalid-scope-1.7.xml | 2 +-
.../test/resources/1.7/invalid-serialnumber-1.7.json | 4 ++--
.../test/resources/1.7/invalid-serialnumber-1.7.xml | 2 +-
.../test/resources/1.7/invalid-service-data-1.7.json | 4 ++--
.../test/resources/1.7/invalid-service-data-1.7.xml | 2 +-
.../src/test/resources/1.7/valid-annotation-1.7.json | 4 ++--
.../resources/1.7/valid-annotation-1.7.textproto | 4 ++--
.../src/test/resources/1.7/valid-annotation-1.7.xml | 2 +-
tools/src/test/resources/1.7/valid-assembly-1.7.json | 4 ++--
.../test/resources/1.7/valid-assembly-1.7.textproto | 4 ++--
tools/src/test/resources/1.7/valid-assembly-1.7.xml | 2 +-
.../test/resources/1.7/valid-attestation-1.7.json | 4 ++--
.../resources/1.7/valid-attestation-1.7.textproto | 4 ++--
.../src/test/resources/1.7/valid-attestation-1.7.xml | 4 ++--
tools/src/test/resources/1.7/valid-bom-1.7.json | 6 +++---
tools/src/test/resources/1.7/valid-bom-1.7.textproto | 4 ++--
tools/src/test/resources/1.7/valid-bom-1.7.xml | 4 ++--
.../test/resources/1.7/valid-component-data-1.7.json | 4 ++--
.../resources/1.7/valid-component-data-1.7.textproto | 6 +++---
.../test/resources/1.7/valid-component-data-1.7.xml | 2 +-
.../resources/1.7/valid-component-hashes-1.7.json | 4 ++--
.../1.7/valid-component-hashes-1.7.textproto | 4 ++--
.../resources/1.7/valid-component-hashes-1.7.xml | 2 +-
.../1.7/valid-component-identifiers-1.7.json | 4 ++--
.../1.7/valid-component-identifiers-1.7.textproto | 4 ++--
.../1.7/valid-component-identifiers-1.7.xml | 2 +-
.../test/resources/1.7/valid-component-ref-1.7.json | 4 ++--
.../resources/1.7/valid-component-ref-1.7.textproto | 4 ++--
.../test/resources/1.7/valid-component-ref-1.7.xml | 2 +-
.../test/resources/1.7/valid-component-swid-1.7.json | 4 ++--
.../resources/1.7/valid-component-swid-1.7.textproto | 4 ++--
.../test/resources/1.7/valid-component-swid-1.7.xml | 2 +-
.../resources/1.7/valid-component-swid-full-1.7.json | 4 ++--
.../1.7/valid-component-swid-full-1.7.textproto | 4 ++--
.../resources/1.7/valid-component-swid-full-1.7.xml | 2 +-
.../resources/1.7/valid-component-types-1.7.json | 4 ++--
.../1.7/valid-component-types-1.7.textproto | 6 +++---
.../test/resources/1.7/valid-component-types-1.7.xml | 2 +-
.../test/resources/1.7/valid-compositions-1.7.json | 4 ++--
.../resources/1.7/valid-compositions-1.7.textproto | 4 ++--
.../test/resources/1.7/valid-compositions-1.7.xml | 2 +-
.../resources/1.7/valid-cryptography-full-1.7.json | 4 ++--
.../1.7/valid-cryptography-full-1.7.textproto | 4 ++--
.../resources/1.7/valid-cryptography-full-1.7.xml | 2 +-
.../1.7/valid-cryptography-implementation-1.7.json | 6 +++---
.../valid-cryptography-implementation-1.7.textproto | 10 +++++-----
.../1.7/valid-cryptography-implementation-1.7.xml | 4 ++--
.../src/test/resources/1.7/valid-dependency-1.7.json | 4 ++--
.../resources/1.7/valid-dependency-1.7.textproto | 4 ++--
.../src/test/resources/1.7/valid-dependency-1.7.xml | 2 +-
.../resources/1.7/valid-empty-components-1.7.json | 4 ++--
.../1.7/valid-empty-components-1.7.textproto | 4 ++--
.../resources/1.7/valid-empty-components-1.7.xml | 2 +-
tools/src/test/resources/1.7/valid-evidence-1.7.json | 4 ++--
.../test/resources/1.7/valid-evidence-1.7.textproto | 6 +++---
tools/src/test/resources/1.7/valid-evidence-1.7.xml | 2 +-
.../resources/1.7/valid-external-elements-1.7.xml | 2 +-
.../resources/1.7/valid-external-reference-1.7.json | 4 ++--
.../1.7/valid-external-reference-1.7.textproto | 6 +++---
.../resources/1.7/valid-external-reference-1.7.xml | 2 +-
.../test/resources/1.7/valid-formulation-1.7.json | 4 ++--
.../resources/1.7/valid-formulation-1.7.textproto | 4 ++--
.../src/test/resources/1.7/valid-formulation-1.7.xml | 2 +-
.../resources/1.7/valid-license-expression-1.7.json | 8 ++++----
.../1.7/valid-license-expression-1.7.textproto | 8 ++++----
.../resources/1.7/valid-license-expression-1.7.xml | 2 +-
.../src/test/resources/1.7/valid-license-id-1.7.json | 4 ++--
.../resources/1.7/valid-license-id-1.7.textproto | 4 ++--
.../src/test/resources/1.7/valid-license-id-1.7.xml | 2 +-
.../resources/1.7/valid-license-licensing-1.7.json | 4 ++--
.../1.7/valid-license-licensing-1.7.textproto | 4 ++--
.../resources/1.7/valid-license-licensing-1.7.xml | 2 +-
.../test/resources/1.7/valid-license-name-1.7.json | 6 +++---
.../resources/1.7/valid-license-name-1.7.textproto | 6 +++---
.../test/resources/1.7/valid-license-name-1.7.xml | 2 +-
.../resources/1.7/valid-machine-learning-1.7.json | 4 ++--
.../1.7/valid-machine-learning-1.7.textproto | 4 ++--
.../resources/1.7/valid-machine-learning-1.7.xml | 2 +-
...alid-machine-learning-considerations-env-1.7.json | 4 ++--
...machine-learning-considerations-env-1.7.textproto | 4 ++--
...valid-machine-learning-considerations-env-1.7.xml | 2 +-
.../resources/1.7/valid-metadata-author-1.7.json | 4 ++--
.../1.7/valid-metadata-author-1.7.textproto | 4 ++--
.../test/resources/1.7/valid-metadata-author-1.7.xml | 2 +-
.../resources/1.7/valid-metadata-license-1.7.json | 4 ++--
.../1.7/valid-metadata-license-1.7.textproto | 4 ++--
.../resources/1.7/valid-metadata-license-1.7.xml | 4 ++--
.../resources/1.7/valid-metadata-lifecycle-1.7.json | 4 ++--
.../1.7/valid-metadata-lifecycle-1.7.textproto | 4 ++--
.../resources/1.7/valid-metadata-lifecycle-1.7.xml | 4 ++--
.../1.7/valid-metadata-manufacture-1.7.json | 4 ++--
.../1.7/valid-metadata-manufacture-1.7.textproto | 4 ++--
.../resources/1.7/valid-metadata-manufacture-1.7.xml | 2 +-
.../1.7/valid-metadata-manufacturer-1.7.json | 4 ++--
.../1.7/valid-metadata-manufacturer-1.7.textproto | 4 ++--
.../1.7/valid-metadata-manufacturer-1.7.xml | 2 +-
.../resources/1.7/valid-metadata-supplier-1.7.json | 4 ++--
.../1.7/valid-metadata-supplier-1.7.textproto | 4 ++--
.../resources/1.7/valid-metadata-supplier-1.7.xml | 2 +-
.../resources/1.7/valid-metadata-timestamp-1.7.json | 4 ++--
.../1.7/valid-metadata-timestamp-1.7.textproto | 4 ++--
.../resources/1.7/valid-metadata-timestamp-1.7.xml | 2 +-
.../test/resources/1.7/valid-metadata-tool-1.7.json | 4 ++--
.../resources/1.7/valid-metadata-tool-1.7.textproto | 4 ++--
.../test/resources/1.7/valid-metadata-tool-1.7.xml | 2 +-
.../1.7/valid-metadata-tool-deprecated-1.7.json | 4 ++--
.../1.7/valid-metadata-tool-deprecated-1.7.textproto | 4 ++--
.../1.7/valid-metadata-tool-deprecated-1.7.xml | 2 +-
.../test/resources/1.7/valid-minimal-viable-1.7.json | 4 ++--
.../resources/1.7/valid-minimal-viable-1.7.textproto | 4 ++--
.../test/resources/1.7/valid-minimal-viable-1.7.xml | 2 +-
tools/src/test/resources/1.7/valid-patch-1.7.json | 4 ++--
.../src/test/resources/1.7/valid-patch-1.7.textproto | 4 ++--
tools/src/test/resources/1.7/valid-patch-1.7.xml | 2 +-
.../src/test/resources/1.7/valid-properties-1.7.json | 4 ++--
.../resources/1.7/valid-properties-1.7.textproto | 4 ++--
.../src/test/resources/1.7/valid-properties-1.7.xml | 2 +-
.../resources/1.7/valid-random-attributes-1.7.xml | 2 +-
.../test/resources/1.7/valid-release-notes-1.7.json | 4 ++--
.../resources/1.7/valid-release-notes-1.7.textproto | 12 ++++++------
.../test/resources/1.7/valid-release-notes-1.7.xml | 2 +-
tools/src/test/resources/1.7/valid-saasbom-1.7.json | 4 ++--
.../test/resources/1.7/valid-saasbom-1.7.textproto | 8 ++++----
tools/src/test/resources/1.7/valid-saasbom-1.7.xml | 4 ++--
tools/src/test/resources/1.7/valid-service-1.7.json | 4 ++--
.../test/resources/1.7/valid-service-1.7.textproto | 4 ++--
tools/src/test/resources/1.7/valid-service-1.7.xml | 2 +-
.../1.7/valid-service-empty-objects-1.7.json | 4 ++--
.../1.7/valid-service-empty-objects-1.7.textproto | 4 ++--
.../1.7/valid-service-empty-objects-1.7.xml | 2 +-
.../src/test/resources/1.7/valid-signatures-1.7.json | 4 ++--
tools/src/test/resources/1.7/valid-standard-1.7.json | 4 ++--
.../test/resources/1.7/valid-standard-1.7.textproto | 6 +++---
tools/src/test/resources/1.7/valid-standard-1.7.xml | 4 ++--
tools/src/test/resources/1.7/valid-tags-1.7.json | 4 ++--
.../src/test/resources/1.7/valid-tags-1.7.textproto | 4 ++--
tools/src/test/resources/1.7/valid-tags-1.7.xml | 2 +-
.../test/resources/1.7/valid-vulnerability-1.7.json | 4 ++--
.../resources/1.7/valid-vulnerability-1.7.textproto | 4 ++--
.../test/resources/1.7/valid-vulnerability-1.7.xml | 2 +-
.../test/resources/1.7/valid-xml-signature-1.7.xml | 2 +-
187 files changed, 334 insertions(+), 334 deletions(-)
diff --git a/tools/src/test/resources/1.7/invalid-bomformat-1.7.json b/tools/src/test/resources/1.7/invalid-bomformat-1.7.json
index f4874069..5d237dac 100644
--- a/tools/src/test/resources/1.7/invalid-bomformat-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-bomformat-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "AnotherFormat",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-component-ref-1.7.json b/tools/src/test/resources/1.7/invalid-component-ref-1.7.json
index b4856c5d..403612d5 100644
--- a/tools/src/test/resources/1.7/invalid-component-ref-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-component-ref-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-component-ref-1.7.xml b/tools/src/test/resources/1.7/invalid-component-ref-1.7.xml
index 770efd83..5e9cdd35 100644
--- a/tools/src/test/resources/1.7/invalid-component-ref-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-component-ref-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library" bom-ref="123">
<name>acme-library</name>
diff --git a/tools/src/test/resources/1.7/invalid-component-swid-1.7.json b/tools/src/test/resources/1.7/invalid-component-swid-1.7.json
index 7acf18d4..15fe6bf0 100644
--- a/tools/src/test/resources/1.7/invalid-component-swid-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-component-swid-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-component-swid-1.7.xml b/tools/src/test/resources/1.7/invalid-component-swid-1.7.xml
index 453d02b9..d38ee4a9 100644
--- a/tools/src/test/resources/1.7/invalid-component-swid-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-component-swid-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<author>Acme Super Heros</author>
diff --git a/tools/src/test/resources/1.7/invalid-component-type-1.7.json b/tools/src/test/resources/1.7/invalid-component-type-1.7.json
index bc5dd16a..82e45253 100644
--- a/tools/src/test/resources/1.7/invalid-component-type-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-component-type-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-component-type-1.7.xml b/tools/src/test/resources/1.7/invalid-component-type-1.7.xml
index cd9738c6..50908e0d 100644
--- a/tools/src/test/resources/1.7/invalid-component-type-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-component-type-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="foo">
<name>acme-library</name>
diff --git a/tools/src/test/resources/1.7/invalid-dependency-1.7.json b/tools/src/test/resources/1.7/invalid-dependency-1.7.json
index e46c5ca2..1156cad4 100644
--- a/tools/src/test/resources/1.7/invalid-dependency-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-dependency-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-dependency-1.7.xml b/tools/src/test/resources/1.7/invalid-dependency-1.7.xml
index ae2daa3d..9bf90fc3 100644
--- a/tools/src/test/resources/1.7/invalid-dependency-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-dependency-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library" bom-ref="library-a">
<name>acme-library-a</name>
diff --git a/tools/src/test/resources/1.7/invalid-empty-component-1.7.json b/tools/src/test/resources/1.7/invalid-empty-component-1.7.json
index ced677ee..be61494c 100644
--- a/tools/src/test/resources/1.7/invalid-empty-component-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-empty-component-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-empty-component-1.7.xml b/tools/src/test/resources/1.7/invalid-empty-component-1.7.xml
index 71d9e7ec..ac50816b 100644
--- a/tools/src/test/resources/1.7/invalid-empty-component-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-empty-component-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
</component>
diff --git a/tools/src/test/resources/1.7/invalid-hash-alg-1.7.json b/tools/src/test/resources/1.7/invalid-hash-alg-1.7.json
index a841909f..cd2fdaec 100644
--- a/tools/src/test/resources/1.7/invalid-hash-alg-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-hash-alg-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-hash-alg-1.7.xml b/tools/src/test/resources/1.7/invalid-hash-alg-1.7.xml
index dd45222b..5dc84fff 100644
--- a/tools/src/test/resources/1.7/invalid-hash-alg-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-hash-alg-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>acme-library</name>
diff --git a/tools/src/test/resources/1.7/invalid-hash-md5-1.7.json b/tools/src/test/resources/1.7/invalid-hash-md5-1.7.json
index 37140dfe..95e33a11 100644
--- a/tools/src/test/resources/1.7/invalid-hash-md5-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-hash-md5-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-hash-md5-1.7.xml b/tools/src/test/resources/1.7/invalid-hash-md5-1.7.xml
index 8bf8c526..7e8c5091 100644
--- a/tools/src/test/resources/1.7/invalid-hash-md5-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-hash-md5-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>acme-library</name>
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha1-1.7.json b/tools/src/test/resources/1.7/invalid-hash-sha1-1.7.json
index ba3ef962..a8cb6852 100644
--- a/tools/src/test/resources/1.7/invalid-hash-sha1-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-hash-sha1-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha1-1.7.xml b/tools/src/test/resources/1.7/invalid-hash-sha1-1.7.xml
index 74f9eb22..29673d23 100644
--- a/tools/src/test/resources/1.7/invalid-hash-sha1-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-hash-sha1-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>acme-library</name>
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha256-1.7.json b/tools/src/test/resources/1.7/invalid-hash-sha256-1.7.json
index 1944c51d..9f284dac 100644
--- a/tools/src/test/resources/1.7/invalid-hash-sha256-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-hash-sha256-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha256-1.7.xml b/tools/src/test/resources/1.7/invalid-hash-sha256-1.7.xml
index bcc3b57b..51d24a8c 100644
--- a/tools/src/test/resources/1.7/invalid-hash-sha256-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-hash-sha256-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>acme-library</name>
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha512-1.7.json b/tools/src/test/resources/1.7/invalid-hash-sha512-1.7.json
index 3065415c..bcfca493 100644
--- a/tools/src/test/resources/1.7/invalid-hash-sha512-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-hash-sha512-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-hash-sha512-1.7.xml b/tools/src/test/resources/1.7/invalid-hash-sha512-1.7.xml
index d28277ca..f8185186 100644
--- a/tools/src/test/resources/1.7/invalid-hash-sha512-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-hash-sha512-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>acme-library</name>
diff --git a/tools/src/test/resources/1.7/invalid-issue-type-1.7.json b/tools/src/test/resources/1.7/invalid-issue-type-1.7.json
index 4e05dae0..5a851eef 100644
--- a/tools/src/test/resources/1.7/invalid-issue-type-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-issue-type-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-issue-type-1.7.xml b/tools/src/test/resources/1.7/invalid-issue-type-1.7.xml
index 8fbb2fb2..a9fe7e4a 100644
--- a/tools/src/test/resources/1.7/invalid-issue-type-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-issue-type-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<group>com.acme</group>
diff --git a/tools/src/test/resources/1.7/invalid-license-choice-1.7.json b/tools/src/test/resources/1.7/invalid-license-choice-1.7.json
index 8977bdad..c6005e1a 100644
--- a/tools/src/test/resources/1.7/invalid-license-choice-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-license-choice-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-license-choice-1.7.xml b/tools/src/test/resources/1.7/invalid-license-choice-1.7.xml
index 2c51eefc..fec014d5 100644
--- a/tools/src/test/resources/1.7/invalid-license-choice-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-license-choice-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/invalid-license-encoding-1.7.json b/tools/src/test/resources/1.7/invalid-license-encoding-1.7.json
index 2c6c074f..44db080f 100644
--- a/tools/src/test/resources/1.7/invalid-license-encoding-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-license-encoding-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-license-encoding-1.7.xml b/tools/src/test/resources/1.7/invalid-license-encoding-1.7.xml
index 9619c6b0..996f0ccf 100644
--- a/tools/src/test/resources/1.7/invalid-license-encoding-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-license-encoding-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/invalid-license-id-1.7.json b/tools/src/test/resources/1.7/invalid-license-id-1.7.json
index c183abc6..97f558e0 100644
--- a/tools/src/test/resources/1.7/invalid-license-id-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-license-id-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-license-id-1.7.xml b/tools/src/test/resources/1.7/invalid-license-id-1.7.xml
index 0497e118..79f9bc5d 100644
--- a/tools/src/test/resources/1.7/invalid-license-id-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-license-id-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/invalid-license-id-count-1.7.xml b/tools/src/test/resources/1.7/invalid-license-id-count-1.7.xml
index 3c21750a..7398699b 100644
--- a/tools/src/test/resources/1.7/invalid-license-id-count-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-license-id-count-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.json b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.json
index b70f8f6d..3a9bbeae 100644
--- a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.textproto b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.textproto
index db656e6e..fb6f96e1 100644
--- a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.textproto
+++ b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
@@ -12,4 +12,4 @@ components {
licenses {
license {}
}
-}
\ No newline at end of file
+}
diff --git a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.xml b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.xml
index 34fff4ec..0a5fab56 100644
--- a/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-license-missing-id-and-name-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>license-with-no-id-nor-name</name>
@@ -10,4 +10,4 @@
</licenses>
</component>
</components>
-</bom>
\ No newline at end of file
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-license-name-count-1.7.xml b/tools/src/test/resources/1.7/invalid-license-name-count-1.7.xml
index 3e91550d..7bf31b55 100644
--- a/tools/src/test/resources/1.7/invalid-license-name-count-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-license-name-count-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/invalid-metadata-license-1.7.json b/tools/src/test/resources/1.7/invalid-metadata-license-1.7.json
index 9db03c94..9b67e54f 100644
--- a/tools/src/test/resources/1.7/invalid-metadata-license-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-metadata-license-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/invalid-metadata-license-1.7.xml b/tools/src/test/resources/1.7/invalid-metadata-license-1.7.xml
index f0f716bb..86702d72 100644
--- a/tools/src/test/resources/1.7/invalid-metadata-license-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-metadata-license-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<licenses>
<license>
@@ -8,4 +8,4 @@
</licenses>
</metadata>
<components />
-</bom>
\ No newline at end of file
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.json b/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.json
index 14bbdee5..90b47ad6 100644
--- a/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.xml b/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.xml
index db47d8df..83a407a9 100644
--- a/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-metadata-timestamp-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<timestamp>2020-04-07</timestamp>
</metadata>
diff --git a/tools/src/test/resources/1.7/invalid-missing-component-type-1.7.json b/tools/src/test/resources/1.7/invalid-missing-component-type-1.7.json
index ea53406f..ae4fdf5d 100644
--- a/tools/src/test/resources/1.7/invalid-missing-component-type-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-missing-component-type-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-missing-component-type-1.7.xml b/tools/src/test/resources/1.7/invalid-missing-component-type-1.7.xml
index d467421f..8cf61f5f 100644
--- a/tools/src/test/resources/1.7/invalid-missing-component-type-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-missing-component-type-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component>
<name>acme-library</name>
diff --git a/tools/src/test/resources/1.7/invalid-patch-type-1.7.json b/tools/src/test/resources/1.7/invalid-patch-type-1.7.json
index 51de20b1..34f7ac59 100644
--- a/tools/src/test/resources/1.7/invalid-patch-type-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-patch-type-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-patch-type-1.7.xml b/tools/src/test/resources/1.7/invalid-patch-type-1.7.xml
index 78cff1fd..1fc9f3bb 100644
--- a/tools/src/test/resources/1.7/invalid-patch-type-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-patch-type-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<group>com.acme</group>
diff --git a/tools/src/test/resources/1.7/invalid-properties-1.7.json b/tools/src/test/resources/1.7/invalid-properties-1.7.json
index 219544f3..76daa51c 100644
--- a/tools/src/test/resources/1.7/invalid-properties-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-properties-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:bcb403ae-91fa-436e-bc93-84d1078cdeed",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/invalid-properties-1.7.textproto b/tools/src/test/resources/1.7/invalid-properties-1.7.textproto
index a707e762..918e13ad 100644
--- a/tools/src/test/resources/1.7/invalid-properties-1.7.textproto
+++ b/tools/src/test/resources/1.7/invalid-properties-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:bcb403ae-91fa-436e-bc93-84d1078cdeed"
metadata {
diff --git a/tools/src/test/resources/1.7/invalid-properties-1.7.xml b/tools/src/test/resources/1.7/invalid-properties-1.7.xml
index 9c54127f..d0b8cec8 100644
--- a/tools/src/test/resources/1.7/invalid-properties-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-properties-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:bcb403ae-91fa-436e-bc93-84d1078cdeed" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:bcb403ae-91fa-436e-bc93-84d1078cdeed" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<properties>
<property>missing a name</property>
diff --git a/tools/src/test/resources/1.7/invalid-scope-1.7.json b/tools/src/test/resources/1.7/invalid-scope-1.7.json
index dcc78ab5..6ee45e51 100644
--- a/tools/src/test/resources/1.7/invalid-scope-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-scope-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-scope-1.7.xml b/tools/src/test/resources/1.7/invalid-scope-1.7.xml
index d6e615aa..c96b1349 100644
--- a/tools/src/test/resources/1.7/invalid-scope-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-scope-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>acme-library</name>
diff --git a/tools/src/test/resources/1.7/invalid-serialnumber-1.7.json b/tools/src/test/resources/1.7/invalid-serialnumber-1.7.json
index 9aea4ae4..d69415f5 100644
--- a/tools/src/test/resources/1.7/invalid-serialnumber-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-serialnumber-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/invalid-serialnumber-1.7.xml b/tools/src/test/resources/1.7/invalid-serialnumber-1.7.xml
index 10e8ae0f..7cdedc7d 100644
--- a/tools/src/test/resources/1.7/invalid-serialnumber-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-serialnumber-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/invalid-service-data-1.7.json b/tools/src/test/resources/1.7/invalid-service-data-1.7.json
index 9fb86ef6..89f19f29 100644
--- a/tools/src/test/resources/1.7/invalid-service-data-1.7.json
+++ b/tools/src/test/resources/1.7/invalid-service-data-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"services": [
diff --git a/tools/src/test/resources/1.7/invalid-service-data-1.7.xml b/tools/src/test/resources/1.7/invalid-service-data-1.7.xml
index 0d1a2bf3..dac27648 100644
--- a/tools/src/test/resources/1.7/invalid-service-data-1.7.xml
+++ b/tools/src/test/resources/1.7/invalid-service-data-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<services>
<service bom-ref="b2a46a4b-8367-4bae-9820-95557cfe03a8">
<name>Stock ticker service</name>
diff --git a/tools/src/test/resources/1.7/valid-annotation-1.7.json b/tools/src/test/resources/1.7/valid-annotation-1.7.json
index 108d5ed8..8d58d41f 100644
--- a/tools/src/test/resources/1.7/valid-annotation-1.7.json
+++ b/tools/src/test/resources/1.7/valid-annotation-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-annotation-1.7.textproto b/tools/src/test/resources/1.7/valid-annotation-1.7.textproto
index 8db97718..90121b4a 100644
--- a/tools/src/test/resources/1.7/valid-annotation-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-annotation-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-annotation-1.7.xml b/tools/src/test/resources/1.7/valid-annotation-1.7.xml
index c329a23c..270802dc 100644
--- a/tools/src/test/resources/1.7/valid-annotation-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-annotation-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library" bom-ref="component-a">
<name>Component A</name>
diff --git a/tools/src/test/resources/1.7/valid-assembly-1.7.json b/tools/src/test/resources/1.7/valid-assembly-1.7.json
index 864e0e4f..26704af4 100644
--- a/tools/src/test/resources/1.7/valid-assembly-1.7.json
+++ b/tools/src/test/resources/1.7/valid-assembly-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-assembly-1.7.textproto b/tools/src/test/resources/1.7/valid-assembly-1.7.textproto
index ea47f51c..14df006a 100644
--- a/tools/src/test/resources/1.7/valid-assembly-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-assembly-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-assembly-1.7.xml b/tools/src/test/resources/1.7/valid-assembly-1.7.xml
index 089ce080..e3410932 100644
--- a/tools/src/test/resources/1.7/valid-assembly-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-assembly-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>acme-library-a</name>
diff --git a/tools/src/test/resources/1.7/valid-attestation-1.7.json b/tools/src/test/resources/1.7/valid-attestation-1.7.json
index 9caa455d..e2d9c31f 100644
--- a/tools/src/test/resources/1.7/valid-attestation-1.7.json
+++ b/tools/src/test/resources/1.7/valid-attestation-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"declarations": {
diff --git a/tools/src/test/resources/1.7/valid-attestation-1.7.textproto b/tools/src/test/resources/1.7/valid-attestation-1.7.textproto
index 0909b277..6214f0dd 100644
--- a/tools/src/test/resources/1.7/valid-attestation-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-attestation-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
declarations: {
diff --git a/tools/src/test/resources/1.7/valid-attestation-1.7.xml b/tools/src/test/resources/1.7/valid-attestation-1.7.xml
index 4f34748a..0798f27a 100644
--- a/tools/src/test/resources/1.7/valid-attestation-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-attestation-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<declarations>
<assessors>
<assessor bom-ref="assessor-1">
@@ -162,4 +162,4 @@
<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<!-- XML signature here -->
</ds:Signature>
-</bom>
\ No newline at end of file
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-bom-1.7.json b/tools/src/test/resources/1.7/valid-bom-1.7.json
index 9ab00e7b..f8d70f7e 100644
--- a/tools/src/test/resources/1.7/valid-bom-1.7.json
+++ b/tools/src/test/resources/1.7/valid-bom-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
@@ -295,4 +295,4 @@
]
}
]
-}
\ No newline at end of file
+}
diff --git a/tools/src/test/resources/1.7/valid-bom-1.7.textproto b/tools/src/test/resources/1.7/valid-bom-1.7.textproto
index 7338519c..f044b119 100644
--- a/tools/src/test/resources/1.7/valid-bom-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-bom-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-bom-1.7.xml b/tools/src/test/resources/1.7/valid-bom-1.7.xml
index 5f94ce13..7914a68b 100644
--- a/tools/src/test/resources/1.7/valid-bom-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-bom-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<timestamp>2020-04-13T20:20:39+00:00</timestamp>
<tools>
@@ -199,5 +199,5 @@
<dependency ref="pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar">
<dependency ref="pkg:maven/com.example/myapplication@1.0.0?packaging=war"/>
</dependency>
- </dependencies>
+ </dependencies>
</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-data-1.7.json b/tools/src/test/resources/1.7/valid-component-data-1.7.json
index f78163f9..98e07c10 100644
--- a/tools/src/test/resources/1.7/valid-component-data-1.7.json
+++ b/tools/src/test/resources/1.7/valid-component-data-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:1b1bff0e-fdb9-4088-8b9a-1a9f2d9006da",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-component-data-1.7.textproto b/tools/src/test/resources/1.7/valid-component-data-1.7.textproto
index da50b701..20bd551a 100644
--- a/tools/src/test/resources/1.7/valid-component-data-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-component-data-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:1b1bff0e-fdb9-4088-8b9a-1a9f2d9006da"
components {
@@ -22,4 +22,4 @@ components {
url: "https://example.com/cfg/1337/env"
}
}
-}
\ No newline at end of file
+}
diff --git a/tools/src/test/resources/1.7/valid-component-data-1.7.xml b/tools/src/test/resources/1.7/valid-component-data-1.7.xml
index fe89d803..1c1b4c25 100644
--- a/tools/src/test/resources/1.7/valid-component-data-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-component-data-1.7.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<bom serialNumber="urn:uuid:1b1bff0e-fdb9-4088-8b9a-1a9f2d9006da" version="1"
- xmlns="http://cyclonedx.org/schema/bom/1.6">
+ xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="data">
<name>my-configs</name>
diff --git a/tools/src/test/resources/1.7/valid-component-hashes-1.7.json b/tools/src/test/resources/1.7/valid-component-hashes-1.7.json
index 91d15f58..c62e83cf 100644
--- a/tools/src/test/resources/1.7/valid-component-hashes-1.7.json
+++ b/tools/src/test/resources/1.7/valid-component-hashes-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-component-hashes-1.7.textproto b/tools/src/test/resources/1.7/valid-component-hashes-1.7.textproto
index 2c74661d..a1fbbf23 100644
--- a/tools/src/test/resources/1.7/valid-component-hashes-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-component-hashes-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-component-hashes-1.7.xml b/tools/src/test/resources/1.7/valid-component-hashes-1.7.xml
index 4e5fcc61..a44526fd 100644
--- a/tools/src/test/resources/1.7/valid-component-hashes-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-component-hashes-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>acme-example</name>
diff --git a/tools/src/test/resources/1.7/valid-component-identifiers-1.7.json b/tools/src/test/resources/1.7/valid-component-identifiers-1.7.json
index de0d2a09..9d2dc84d 100644
--- a/tools/src/test/resources/1.7/valid-component-identifiers-1.7.json
+++ b/tools/src/test/resources/1.7/valid-component-identifiers-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-component-identifiers-1.7.textproto b/tools/src/test/resources/1.7/valid-component-identifiers-1.7.textproto
index 46d4fd9f..b0f1bcf0 100644
--- a/tools/src/test/resources/1.7/valid-component-identifiers-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-component-identifiers-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-component-identifiers-1.7.xml b/tools/src/test/resources/1.7/valid-component-identifiers-1.7.xml
index bf74b7df..db003af4 100644
--- a/tools/src/test/resources/1.7/valid-component-identifiers-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-component-identifiers-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<group>com.example</group>
diff --git a/tools/src/test/resources/1.7/valid-component-ref-1.7.json b/tools/src/test/resources/1.7/valid-component-ref-1.7.json
index c31d31e5..be40df47 100644
--- a/tools/src/test/resources/1.7/valid-component-ref-1.7.json
+++ b/tools/src/test/resources/1.7/valid-component-ref-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-component-ref-1.7.textproto b/tools/src/test/resources/1.7/valid-component-ref-1.7.textproto
index 82060a83..1c13a831 100644
--- a/tools/src/test/resources/1.7/valid-component-ref-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-component-ref-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-component-ref-1.7.xml b/tools/src/test/resources/1.7/valid-component-ref-1.7.xml
index b65c42d1..32746e8a 100644
--- a/tools/src/test/resources/1.7/valid-component-ref-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-component-ref-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library" bom-ref="123">
<name>acme-library</name>
diff --git a/tools/src/test/resources/1.7/valid-component-swid-1.7.json b/tools/src/test/resources/1.7/valid-component-swid-1.7.json
index bff17b97..2cdbb4f2 100644
--- a/tools/src/test/resources/1.7/valid-component-swid-1.7.json
+++ b/tools/src/test/resources/1.7/valid-component-swid-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-component-swid-1.7.textproto b/tools/src/test/resources/1.7/valid-component-swid-1.7.textproto
index 65380733..4300647f 100644
--- a/tools/src/test/resources/1.7/valid-component-swid-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-component-swid-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-component-swid-1.7.xml b/tools/src/test/resources/1.7/valid-component-swid-1.7.xml
index 3d4a954d..718ca496 100644
--- a/tools/src/test/resources/1.7/valid-component-swid-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-component-swid-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<author>Acme Super Heros</author>
diff --git a/tools/src/test/resources/1.7/valid-component-swid-full-1.7.json b/tools/src/test/resources/1.7/valid-component-swid-full-1.7.json
index e0e83115..65b8aefc 100644
--- a/tools/src/test/resources/1.7/valid-component-swid-full-1.7.json
+++ b/tools/src/test/resources/1.7/valid-component-swid-full-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-component-swid-full-1.7.textproto b/tools/src/test/resources/1.7/valid-component-swid-full-1.7.textproto
index 5d4e6a0e..8869b12c 100644
--- a/tools/src/test/resources/1.7/valid-component-swid-full-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-component-swid-full-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-component-swid-full-1.7.xml b/tools/src/test/resources/1.7/valid-component-swid-full-1.7.xml
index f0f7d407..b5d9f9d2 100644
--- a/tools/src/test/resources/1.7/valid-component-swid-full-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-component-swid-full-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<author>Acme Super Heros</author>
diff --git a/tools/src/test/resources/1.7/valid-component-types-1.7.json b/tools/src/test/resources/1.7/valid-component-types-1.7.json
index 8b1abd7e..ec39472f 100644
--- a/tools/src/test/resources/1.7/valid-component-types-1.7.json
+++ b/tools/src/test/resources/1.7/valid-component-types-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-component-types-1.7.textproto b/tools/src/test/resources/1.7/valid-component-types-1.7.textproto
index 6a5c4311..0daa8e1a 100644
--- a/tools/src/test/resources/1.7/valid-component-types-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-component-types-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
@@ -48,4 +48,4 @@ components {
type: CLASSIFICATION_DATA
name: "data-a"
version: "1.0"
-}
\ No newline at end of file
+}
diff --git a/tools/src/test/resources/1.7/valid-component-types-1.7.xml b/tools/src/test/resources/1.7/valid-component-types-1.7.xml
index d8c70784..83c80f76 100644
--- a/tools/src/test/resources/1.7/valid-component-types-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-component-types-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<name>application-a</name>
diff --git a/tools/src/test/resources/1.7/valid-compositions-1.7.json b/tools/src/test/resources/1.7/valid-compositions-1.7.json
index 8b8dcbf3..03f47527 100644
--- a/tools/src/test/resources/1.7/valid-compositions-1.7.json
+++ b/tools/src/test/resources/1.7/valid-compositions-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-compositions-1.7.textproto b/tools/src/test/resources/1.7/valid-compositions-1.7.textproto
index 1218f026..9b9c07ea 100644
--- a/tools/src/test/resources/1.7/valid-compositions-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-compositions-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-compositions-1.7.xml b/tools/src/test/resources/1.7/valid-compositions-1.7.xml
index f99ed830..ace5f57b 100644
--- a/tools/src/test/resources/1.7/valid-compositions-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-compositions-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<component type="application" bom-ref="acme-application-1.0">
<name>Acme Application</name>
diff --git a/tools/src/test/resources/1.7/valid-cryptography-full-1.7.json b/tools/src/test/resources/1.7/valid-cryptography-full-1.7.json
index ac134465..adf03047 100644
--- a/tools/src/test/resources/1.7/valid-cryptography-full-1.7.json
+++ b/tools/src/test/resources/1.7/valid-cryptography-full-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-cryptography-full-1.7.textproto b/tools/src/test/resources/1.7/valid-cryptography-full-1.7.textproto
index 9af87b05..d2065ff9 100644
--- a/tools/src/test/resources/1.7/valid-cryptography-full-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-cryptography-full-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components: [
diff --git a/tools/src/test/resources/1.7/valid-cryptography-full-1.7.xml b/tools/src/test/resources/1.7/valid-cryptography-full-1.7.xml
index 0e151a34..ef2c46df 100644
--- a/tools/src/test/resources/1.7/valid-cryptography-full-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-cryptography-full-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="cryptographic-asset" bom-ref="asset-1">
<name>Name here</name>
diff --git a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.json b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.json
index a143b9b3..d2499425 100644
--- a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.json
+++ b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
@@ -30,7 +30,7 @@
"classicalSecurityLevel": 128,
"nistQuantumSecurityLevel": 1
},
- "oid": "oid:2.16.840.1.101.3.4.1.6"
+ "oid": "oid:2.16.840.1.101.3.4.1.7"
}
},
{
diff --git a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.textproto b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.textproto
index de14145f..8e7f928e 100644
--- a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.textproto
@@ -1,10 +1,10 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-# proto-file: schema/bom-1.6.proto
-# proto-message:
+# proto-file: schema/bom-1.7.proto
+# proto-message:
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata: {
@@ -38,7 +38,7 @@ components: [
classicalSecurityLevel: 128
nistQuantumSecurityLevel: 1
},
- oid: "oid:2.16.840.1.101.3.4.1.6"
+ oid: "oid:2.16.840.1.101.3.4.1.7"
}
},
{
diff --git a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.xml b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.xml
index e86ae594..47ce09cc 100644
--- a/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-cryptography-implementation-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<component type="application" bom-ref="acme-application">
<name>Acme Application</name>
@@ -27,7 +27,7 @@
<classicalSecurityLevel>128</classicalSecurityLevel>
<nistQuantumSecurityLevel>1</nistQuantumSecurityLevel>
</algorithmProperties>
- <oid>oid:2.16.840.1.101.3.4.1.6</oid>
+ <oid>oid:2.16.840.1.101.3.4.1.7</oid>
</cryptoProperties>
</component>
<component type="library" bom-ref="crypto-library">
diff --git a/tools/src/test/resources/1.7/valid-dependency-1.7.json b/tools/src/test/resources/1.7/valid-dependency-1.7.json
index 1e87f38e..4b4d48a8 100644
--- a/tools/src/test/resources/1.7/valid-dependency-1.7.json
+++ b/tools/src/test/resources/1.7/valid-dependency-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-dependency-1.7.textproto b/tools/src/test/resources/1.7/valid-dependency-1.7.textproto
index 363dfba9..23cbd01b 100644
--- a/tools/src/test/resources/1.7/valid-dependency-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-dependency-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-dependency-1.7.xml b/tools/src/test/resources/1.7/valid-dependency-1.7.xml
index 7fab8347..bc43869f 100644
--- a/tools/src/test/resources/1.7/valid-dependency-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-dependency-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library" bom-ref="library-a">
<name>library-a</name>
diff --git a/tools/src/test/resources/1.7/valid-empty-components-1.7.json b/tools/src/test/resources/1.7/valid-empty-components-1.7.json
index a634de3f..8c3ca406 100644
--- a/tools/src/test/resources/1.7/valid-empty-components-1.7.json
+++ b/tools/src/test/resources/1.7/valid-empty-components-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-empty-components-1.7.textproto b/tools/src/test/resources/1.7/valid-empty-components-1.7.textproto
index b40b7c6d..c61fe261 100644
--- a/tools/src/test/resources/1.7/valid-empty-components-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-empty-components-1.7.textproto
@@ -1,6 +1,6 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
diff --git a/tools/src/test/resources/1.7/valid-empty-components-1.7.xml b/tools/src/test/resources/1.7/valid-empty-components-1.7.xml
index 58f7c849..f46b79c1 100644
--- a/tools/src/test/resources/1.7/valid-empty-components-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-empty-components-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
</components>
</bom>
diff --git a/tools/src/test/resources/1.7/valid-evidence-1.7.json b/tools/src/test/resources/1.7/valid-evidence-1.7.json
index 9bb4ebc3..c2e6cdda 100644
--- a/tools/src/test/resources/1.7/valid-evidence-1.7.json
+++ b/tools/src/test/resources/1.7/valid-evidence-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-evidence-1.7.textproto b/tools/src/test/resources/1.7/valid-evidence-1.7.textproto
index e4819eb0..ad479345 100644
--- a/tools/src/test/resources/1.7/valid-evidence-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-evidence-1.7.textproto
@@ -1,10 +1,10 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-# proto-file: bom-1.6.proto
+# proto-file: bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components [
diff --git a/tools/src/test/resources/1.7/valid-evidence-1.7.xml b/tools/src/test/resources/1.7/valid-evidence-1.7.xml
index 32d96983..491b9c73 100644
--- a/tools/src/test/resources/1.7/valid-evidence-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-evidence-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<group>com.google.code.findbugs</group>
diff --git a/tools/src/test/resources/1.7/valid-external-elements-1.7.xml b/tools/src/test/resources/1.7/valid-external-elements-1.7.xml
index 768137a7..ab4bc388 100644
--- a/tools/src/test/resources/1.7/valid-external-elements-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-external-elements-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/valid-external-reference-1.7.json b/tools/src/test/resources/1.7/valid-external-reference-1.7.json
index f5e24561..6b9895a3 100644
--- a/tools/src/test/resources/1.7/valid-external-reference-1.7.json
+++ b/tools/src/test/resources/1.7/valid-external-reference-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-external-reference-1.7.textproto b/tools/src/test/resources/1.7/valid-external-reference-1.7.textproto
index 9a8c3df2..06117b3a 100644
--- a/tools/src/test/resources/1.7/valid-external-reference-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-external-reference-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
@@ -205,5 +205,5 @@ components {
external_references {
type: EXTERNAL_REFERENCE_TYPE_OTHER
url: "http://example.com/extref/other"
- }
+ }
}
diff --git a/tools/src/test/resources/1.7/valid-external-reference-1.7.xml b/tools/src/test/resources/1.7/valid-external-reference-1.7.xml
index 95cffa0d..f46368b1 100644
--- a/tools/src/test/resources/1.7/valid-external-reference-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-external-reference-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/valid-formulation-1.7.json b/tools/src/test/resources/1.7/valid-formulation-1.7.json
index ce49ece6..8d340cd3 100644
--- a/tools/src/test/resources/1.7/valid-formulation-1.7.json
+++ b/tools/src/test/resources/1.7/valid-formulation-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-formulation-1.7.textproto b/tools/src/test/resources/1.7/valid-formulation-1.7.textproto
index 7d71e341..97eda9ae 100644
--- a/tools/src/test/resources/1.7/valid-formulation-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-formulation-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-formulation-1.7.xml b/tools/src/test/resources/1.7/valid-formulation-1.7.xml
index 38441825..b216a690 100644
--- a/tools/src/test/resources/1.7/valid-formulation-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-formulation-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.7.json b/tools/src/test/resources/1.7/valid-license-expression-1.7.json
index dd4f6b99..7deabc9e 100644
--- a/tools/src/test/resources/1.7/valid-license-expression-1.7.json
+++ b/tools/src/test/resources/1.7/valid-license-expression-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
@@ -30,7 +30,7 @@
"alg": "SHA-512",
"content": "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
}
- ],
+ ],
"licenses": [
{
"expression": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
@@ -38,7 +38,7 @@
"bom-ref": "my-license"
}
],
- "purl": "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+ "purl": "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
}
]
}
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.7.textproto b/tools/src/test/resources/1.7/valid-license-expression-1.7.textproto
index 6666405f..5c73640d 100644
--- a/tools/src/test/resources/1.7/valid-license-expression-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-license-expression-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
@@ -27,11 +27,11 @@ components {
hashes {
alg: HASH_ALG_SHA_512
value: "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
- }
+ }
licenses {
expression: "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0"
acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED
bom_ref: "my-license"
}
- purl: "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+ purl: "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
}
diff --git a/tools/src/test/resources/1.7/valid-license-expression-1.7.xml b/tools/src/test/resources/1.7/valid-license-expression-1.7.xml
index 77035ad7..e3afdac7 100644
--- a/tools/src/test/resources/1.7/valid-license-expression-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-license-expression-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.7.json b/tools/src/test/resources/1.7/valid-license-id-1.7.json
index f66e2dfc..7980b79a 100644
--- a/tools/src/test/resources/1.7/valid-license-id-1.7.json
+++ b/tools/src/test/resources/1.7/valid-license-id-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.7.textproto b/tools/src/test/resources/1.7/valid-license-id-1.7.textproto
index 2b9009d7..a0d2550b 100644
--- a/tools/src/test/resources/1.7/valid-license-id-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-license-id-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-license-id-1.7.xml b/tools/src/test/resources/1.7/valid-license-id-1.7.xml
index 1ab6b94f..6e5d76ad 100644
--- a/tools/src/test/resources/1.7/valid-license-id-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-license-id-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/valid-license-licensing-1.7.json b/tools/src/test/resources/1.7/valid-license-licensing-1.7.json
index 613e38a0..6940d7dd 100644
--- a/tools/src/test/resources/1.7/valid-license-licensing-1.7.json
+++ b/tools/src/test/resources/1.7/valid-license-licensing-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-license-licensing-1.7.textproto b/tools/src/test/resources/1.7/valid-license-licensing-1.7.textproto
index f6079d48..67ccd7f0 100644
--- a/tools/src/test/resources/1.7/valid-license-licensing-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-license-licensing-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-license-licensing-1.7.xml b/tools/src/test/resources/1.7/valid-license-licensing-1.7.xml
index 6f620e84..587124e0 100644
--- a/tools/src/test/resources/1.7/valid-license-licensing-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-license-licensing-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.7.json b/tools/src/test/resources/1.7/valid-license-name-1.7.json
index 1afc8250..7d0209d9 100644
--- a/tools/src/test/resources/1.7/valid-license-name-1.7.json
+++ b/tools/src/test/resources/1.7/valid-license-name-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
@@ -39,7 +39,7 @@
}
}
],
- "purl": "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
+ "purl": "pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar"
}
]
}
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.7.textproto b/tools/src/test/resources/1.7/valid-license-name-1.7.textproto
index a157dbd0..11456fbb 100644
--- a/tools/src/test/resources/1.7/valid-license-name-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-license-name-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
@@ -27,7 +27,7 @@ components {
hashes {
alg: HASH_ALG_SHA_512
value: "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282"
- }
+ }
licenses {
license {
name: "Apache License 2.0"
diff --git a/tools/src/test/resources/1.7/valid-license-name-1.7.xml b/tools/src/test/resources/1.7/valid-license-name-1.7.xml
index b6def92e..04f4f1e8 100644
--- a/tools/src/test/resources/1.7/valid-license-name-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-license-name-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.7.json b/tools/src/test/resources/1.7/valid-machine-learning-1.7.json
index dbd0ea7b..708a91a8 100644
--- a/tools/src/test/resources/1.7/valid-machine-learning-1.7.json
+++ b/tools/src/test/resources/1.7/valid-machine-learning-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.7.textproto b/tools/src/test/resources/1.7/valid-machine-learning-1.7.textproto
index 54452d65..0182aca2 100644
--- a/tools/src/test/resources/1.7/valid-machine-learning-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-machine-learning-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.7.xml b/tools/src/test/resources/1.7/valid-machine-learning-1.7.xml
index 6013b1c3..42ba5905 100644
--- a/tools/src/test/resources/1.7/valid-machine-learning-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-machine-learning-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="machine-learning-model" bom-ref="component-a">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.json b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.json
index 07637f75..be3f09da 100644
--- a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.json
+++ b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:ed5c5ba0-2be6-4b58-ac29-01a7fd375123",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.textproto b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.textproto
index c045c9e6..ce0a29af 100644
--- a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:ed5c5ba0-2be6-4b58-ac29-01a7fd375123"
components {
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.xml b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.xml
index d4c54bc4..482bd442 100644
--- a/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-machine-learning-considerations-env-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom xmlns="http://cyclonedx.org/schema/bom/1.6" serialNumber="urn:uuid:ed5c5ba0-2be6-4b58-ac29-01a7fd375123" version="1">
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7" serialNumber="urn:uuid:ed5c5ba0-2be6-4b58-ac29-01a7fd375123" version="1">
<components>
<component type="machine-learning-model" bom-ref="huggingface.co-meta-llama-Llama-2-7b">
<supplier>
diff --git a/tools/src/test/resources/1.7/valid-metadata-author-1.7.json b/tools/src/test/resources/1.7/valid-metadata-author-1.7.json
index 196c0eca..76234ebb 100644
--- a/tools/src/test/resources/1.7/valid-metadata-author-1.7.json
+++ b/tools/src/test/resources/1.7/valid-metadata-author-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-metadata-author-1.7.textproto b/tools/src/test/resources/1.7/valid-metadata-author-1.7.textproto
index 0997b267..fda9e451 100644
--- a/tools/src/test/resources/1.7/valid-metadata-author-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-metadata-author-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-metadata-author-1.7.xml b/tools/src/test/resources/1.7/valid-metadata-author-1.7.xml
index a8217789..ea4ac760 100644
--- a/tools/src/test/resources/1.7/valid-metadata-author-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-metadata-author-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<authors>
<author>
diff --git a/tools/src/test/resources/1.7/valid-metadata-license-1.7.json b/tools/src/test/resources/1.7/valid-metadata-license-1.7.json
index 4861f5ab..dfe45aba 100644
--- a/tools/src/test/resources/1.7/valid-metadata-license-1.7.json
+++ b/tools/src/test/resources/1.7/valid-metadata-license-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-metadata-license-1.7.textproto b/tools/src/test/resources/1.7/valid-metadata-license-1.7.textproto
index b761c2ec..6a920657 100644
--- a/tools/src/test/resources/1.7/valid-metadata-license-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-metadata-license-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-metadata-license-1.7.xml b/tools/src/test/resources/1.7/valid-metadata-license-1.7.xml
index e8c02a31..f52df32b 100644
--- a/tools/src/test/resources/1.7/valid-metadata-license-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-metadata-license-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom xmlns="http://cyclonedx.org/schema/bom/1.6"
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
>
<metadata>
@@ -14,4 +14,4 @@
</licenses>
</metadata>
<components/>
-</bom>
\ No newline at end of file
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.json b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.json
index 275ba3da..67da3e59 100644
--- a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.json
+++ b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.textproto b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.textproto
index 6b47e0eb..a4ed8ada 100644
--- a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.xml b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.xml
index 8b4a8458..2b9717fd 100644
--- a/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-metadata-lifecycle-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<lifecycles>
<lifecycle>
@@ -15,4 +15,4 @@
</lifecycles>
</metadata>
<components />
-</bom>
\ No newline at end of file
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.json b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.json
index 2c9b204a..968db72d 100644
--- a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.json
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.textproto b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.textproto
index aa5b216f..b83a6f78 100644
--- a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.xml b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.xml
index 78ea7e22..4d6fd36f 100644
--- a/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacture-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<manufacture bom-ref="manufacturer-1">
<name>Acme, Inc. // deprecated</name>
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.json b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.json
index 0b373b3b..03f49903 100644
--- a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.json
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.textproto b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.textproto
index 1ec04856..541a813e 100644
--- a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.xml b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.xml
index 94a536cc..031d3628 100644
--- a/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-metadata-manufacturer-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<manufacturer bom-ref="manufacturer-1">
<name>Acme, Inc.</name>
diff --git a/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.json b/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.json
index e212c7a1..69eb99e7 100644
--- a/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.json
+++ b/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.textproto b/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.textproto
index fe4bd39c..830a43a4 100644
--- a/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.xml b/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.xml
index 213a2b37..788837cf 100644
--- a/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-metadata-supplier-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<supplier bom-ref="supplier-1">
<name>Acme, Inc.</name>
diff --git a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.json b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.json
index 90c8f4ce..0e5fa00d 100644
--- a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.json
+++ b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.textproto b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.textproto
index f276e2f8..bed477a3 100644
--- a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.xml b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.xml
index ed8322eb..78b54cf0 100644
--- a/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-metadata-timestamp-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<timestamp>2020-04-13T20:20:39Z</timestamp>
</metadata>
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-1.7.json b/tools/src/test/resources/1.7/valid-metadata-tool-1.7.json
index 9c7b8b58..5e57be3f 100644
--- a/tools/src/test/resources/1.7/valid-metadata-tool-1.7.json
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-1.7.textproto b/tools/src/test/resources/1.7/valid-metadata-tool-1.7.textproto
index 872a92f2..76d2de07 100644
--- a/tools/src/test/resources/1.7/valid-metadata-tool-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-1.7.xml b/tools/src/test/resources/1.7/valid-metadata-tool-1.7.xml
index 8293686e..6c9a9270 100644
--- a/tools/src/test/resources/1.7/valid-metadata-tool-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<tools>
<components>
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.json b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.json
index 485bdd11..268b8b3d 100644
--- a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.json
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.textproto b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.textproto
index 432b1eab..830995fa 100644
--- a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.xml b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.xml
index 0f1dc4fa..26ed1508 100644
--- a/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-metadata-tool-deprecated-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<tools>
<tool>
diff --git a/tools/src/test/resources/1.7/valid-minimal-viable-1.7.json b/tools/src/test/resources/1.7/valid-minimal-viable-1.7.json
index 0ee56744..b96c70f7 100644
--- a/tools/src/test/resources/1.7/valid-minimal-viable-1.7.json
+++ b/tools/src/test/resources/1.7/valid-minimal-viable-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-minimal-viable-1.7.textproto b/tools/src/test/resources/1.7/valid-minimal-viable-1.7.textproto
index 08ca51be..7757aaba 100644
--- a/tools/src/test/resources/1.7/valid-minimal-viable-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-minimal-viable-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-minimal-viable-1.7.xml b/tools/src/test/resources/1.7/valid-minimal-viable-1.7.xml
index 56e9c31d..517e504c 100644
--- a/tools/src/test/resources/1.7/valid-minimal-viable-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-minimal-viable-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>acme-library</name>
diff --git a/tools/src/test/resources/1.7/valid-patch-1.7.json b/tools/src/test/resources/1.7/valid-patch-1.7.json
index 2bb68e50..e02cc031 100644
--- a/tools/src/test/resources/1.7/valid-patch-1.7.json
+++ b/tools/src/test/resources/1.7/valid-patch-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-patch-1.7.textproto b/tools/src/test/resources/1.7/valid-patch-1.7.textproto
index 2dd43f6b..fe85a682 100644
--- a/tools/src/test/resources/1.7/valid-patch-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-patch-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-patch-1.7.xml b/tools/src/test/resources/1.7/valid-patch-1.7.xml
index b543548e..fc487c7d 100644
--- a/tools/src/test/resources/1.7/valid-patch-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-patch-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<group>com.acme</group>
diff --git a/tools/src/test/resources/1.7/valid-properties-1.7.json b/tools/src/test/resources/1.7/valid-properties-1.7.json
index ad62c6f9..7bd6c162 100644
--- a/tools/src/test/resources/1.7/valid-properties-1.7.json
+++ b/tools/src/test/resources/1.7/valid-properties-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-properties-1.7.textproto b/tools/src/test/resources/1.7/valid-properties-1.7.textproto
index 33870683..ba7232f6 100644
--- a/tools/src/test/resources/1.7/valid-properties-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-properties-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
diff --git a/tools/src/test/resources/1.7/valid-properties-1.7.xml b/tools/src/test/resources/1.7/valid-properties-1.7.xml
index ac03d4b8..70e7dec3 100644
--- a/tools/src/test/resources/1.7/valid-properties-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-properties-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<properties>
<property name="Foo">Bar</property>
diff --git a/tools/src/test/resources/1.7/valid-random-attributes-1.7.xml b/tools/src/test/resources/1.7/valid-random-attributes-1.7.xml
index ce0be1cb..3263f17a 100644
--- a/tools/src/test/resources/1.7/valid-random-attributes-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-random-attributes-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom foo="bar" bar="foo" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom foo="bar" bar="foo" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components foo="bar" bar="foo" >
<component foo="bar" bar="foo" type="application">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/valid-release-notes-1.7.json b/tools/src/test/resources/1.7/valid-release-notes-1.7.json
index 0be9e48a..62c836a1 100644
--- a/tools/src/test/resources/1.7/valid-release-notes-1.7.json
+++ b/tools/src/test/resources/1.7/valid-release-notes-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-release-notes-1.7.textproto b/tools/src/test/resources/1.7/valid-release-notes-1.7.textproto
index 9870ee17..a1865d81 100644
--- a/tools/src/test/resources/1.7/valid-release-notes-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-release-notes-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
@@ -21,7 +21,7 @@ components {
timestamp {
seconds: 1631839878
nanos: 0
- }
+ }
aliases: "Project Orion"
tags: "CMS"
tags: "SEO"
@@ -45,7 +45,7 @@ components {
url: "https://nvd.nist.gov/vuln/detail/CVE-2019-9997"
}
references: "http://some/other/site-1"
- references: "http://some/other/site-2"
+ references: "http://some/other/site-2"
}
notes {
locale: "en-US"
@@ -122,7 +122,7 @@ services {
timestamp {
seconds: 1631839878
nanos: 0
- }
+ }
aliases: "Project Orion"
tags: "CMS"
tags: "SEO"
@@ -146,7 +146,7 @@ services {
url: "https://nvd.nist.gov/vuln/detail/CVE-2019-9997"
}
references: "http://some/other/site-1"
- references: "http://some/other/site-2"
+ references: "http://some/other/site-2"
}
notes {
locale: "en-US"
diff --git a/tools/src/test/resources/1.7/valid-release-notes-1.7.xml b/tools/src/test/resources/1.7/valid-release-notes-1.7.xml
index 15caa355..c3dd1cd7 100644
--- a/tools/src/test/resources/1.7/valid-release-notes-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-release-notes-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>acme-example</name>
diff --git a/tools/src/test/resources/1.7/valid-saasbom-1.7.json b/tools/src/test/resources/1.7/valid-saasbom-1.7.json
index 0aa16dd0..9fc4e9d8 100644
--- a/tools/src/test/resources/1.7/valid-saasbom-1.7.json
+++ b/tools/src/test/resources/1.7/valid-saasbom-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
diff --git a/tools/src/test/resources/1.7/valid-saasbom-1.7.textproto b/tools/src/test/resources/1.7/valid-saasbom-1.7.textproto
index 2edfb952..50b3d8e3 100644
--- a/tools/src/test/resources/1.7/valid-saasbom-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-saasbom-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
metadata {
@@ -81,7 +81,7 @@ services {
data {
flow: DATA_FLOW_BI_DIRECTIONAL
value: "PII"
- name: "Stock Service to MS-1"
+ name: "Stock Service to MS-1"
description: "Traffic to/from stock service to microservice-1"
governance: {
owners: [
@@ -91,7 +91,7 @@ services {
}
}
]
- }
+ }
source: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
destination: "urn:cdx:3e671687-395b-41f5-a30f-a58921a69b79/1#stock-ticker-service"
}
diff --git a/tools/src/test/resources/1.7/valid-saasbom-1.7.xml b/tools/src/test/resources/1.7/valid-saasbom-1.7.xml
index 433cf3d9..ef0cea4a 100644
--- a/tools/src/test/resources/1.7/valid-saasbom-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-saasbom-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<metadata>
<timestamp>2021-01-10T12:00:00Z</timestamp>
<component type="application" bom-ref="acme-stock-application">
@@ -154,7 +154,7 @@
<group>com.example</group>
<name>Microservice 3</name>
<version>2022-1</version>
- <description>Example Microservice</description>
+ <description>Example Microservice</description>
<endpoints>
<endpoint>https://ms-3.example.com</endpoint>
</endpoints>
diff --git a/tools/src/test/resources/1.7/valid-service-1.7.json b/tools/src/test/resources/1.7/valid-service-1.7.json
index f5dc557d..4bf3fbd9 100644
--- a/tools/src/test/resources/1.7/valid-service-1.7.json
+++ b/tools/src/test/resources/1.7/valid-service-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-service-1.7.textproto b/tools/src/test/resources/1.7/valid-service-1.7.textproto
index c43ac697..38612cf2 100644
--- a/tools/src/test/resources/1.7/valid-service-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-service-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-service-1.7.xml b/tools/src/test/resources/1.7/valid-service-1.7.xml
index 643effae..5023f8ba 100644
--- a/tools/src/test/resources/1.7/valid-service-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-service-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library" bom-ref="pkg:maven/com.acme/stock-java-client@1.0.12">
<publisher>Acme Inc</publisher>
diff --git a/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.json b/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.json
index 7338836d..8c3c72e7 100644
--- a/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.json
+++ b/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"services": [
diff --git a/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.textproto b/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.textproto
index 1b20a319..e357f5f7 100644
--- a/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
services {
diff --git a/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.xml b/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.xml
index 38023db3..0b484382 100644
--- a/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-service-empty-objects-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<services>
<service bom-ref="b2a46a4b-8367-4bae-9820-95557cfe03a8">
<provider>
diff --git a/tools/src/test/resources/1.7/valid-signatures-1.7.json b/tools/src/test/resources/1.7/valid-signatures-1.7.json
index 5542c90e..d7a7f846 100644
--- a/tools/src/test/resources/1.7/valid-signatures-1.7.json
+++ b/tools/src/test/resources/1.7/valid-signatures-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-standard-1.7.json b/tools/src/test/resources/1.7/valid-standard-1.7.json
index 3150227b..4dc871b2 100644
--- a/tools/src/test/resources/1.7/valid-standard-1.7.json
+++ b/tools/src/test/resources/1.7/valid-standard-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"definitions": {
diff --git a/tools/src/test/resources/1.7/valid-standard-1.7.textproto b/tools/src/test/resources/1.7/valid-standard-1.7.textproto
index 3388c5cd..0478f0dd 100644
--- a/tools/src/test/resources/1.7/valid-standard-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-standard-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6",
+spec_version: "1.7",
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
definitions {
@@ -70,4 +70,4 @@ definitions {
]
}
]
-}
\ No newline at end of file
+}
diff --git a/tools/src/test/resources/1.7/valid-standard-1.7.xml b/tools/src/test/resources/1.7/valid-standard-1.7.xml
index cdf5c037..c7583bea 100644
--- a/tools/src/test/resources/1.7/valid-standard-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-standard-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<definitions>
<standards>
<standard bom-ref="standard-1">
@@ -61,4 +61,4 @@
</standard>
</standards>
</definitions>
-</bom>
\ No newline at end of file
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-tags-1.7.json b/tools/src/test/resources/1.7/valid-tags-1.7.json
index 1052997b..ae9dbeca 100644
--- a/tools/src/test/resources/1.7/valid-tags-1.7.json
+++ b/tools/src/test/resources/1.7/valid-tags-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-tags-1.7.textproto b/tools/src/test/resources/1.7/valid-tags-1.7.textproto
index a2df47d6..455e5839 100644
--- a/tools/src/test/resources/1.7/valid-tags-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-tags-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-tags-1.7.xml b/tools/src/test/resources/1.7/valid-tags-1.7.xml
index 49497a1c..e9553467 100644
--- a/tools/src/test/resources/1.7/valid-tags-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-tags-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library">
<name>my-json-parser</name>
diff --git a/tools/src/test/resources/1.7/valid-vulnerability-1.7.json b/tools/src/test/resources/1.7/valid-vulnerability-1.7.json
index 52bb70f1..4bddb481 100644
--- a/tools/src/test/resources/1.7/valid-vulnerability-1.7.json
+++ b/tools/src/test/resources/1.7/valid-vulnerability-1.7.json
@@ -1,7 +1,7 @@
{
- "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
- "specVersion": "1.6",
+ "specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"components": [
diff --git a/tools/src/test/resources/1.7/valid-vulnerability-1.7.textproto b/tools/src/test/resources/1.7/valid-vulnerability-1.7.textproto
index bec68ebf..ac2533ce 100644
--- a/tools/src/test/resources/1.7/valid-vulnerability-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-vulnerability-1.7.textproto
@@ -1,7 +1,7 @@
-# proto-file: schema/bom-1.6.proto
+# proto-file: schema/bom-1.7.proto
# proto-message: Bom
-spec_version: "1.6"
+spec_version: "1.7"
version: 1
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
components {
diff --git a/tools/src/test/resources/1.7/valid-vulnerability-1.7.xml b/tools/src/test/resources/1.7/valid-vulnerability-1.7.xml
index 33a5412f..bc199840 100644
--- a/tools/src/test/resources/1.7/valid-vulnerability-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-vulnerability-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="library" bom-ref="pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.9.4">
<group>com.fasterxml.jackson.core</group>
diff --git a/tools/src/test/resources/1.7/valid-xml-signature-1.7.xml b/tools/src/test/resources/1.7/valid-xml-signature-1.7.xml
index 930c06ac..1a10f42f 100644
--- a/tools/src/test/resources/1.7/valid-xml-signature-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-xml-signature-1.7.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
+<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
<components>
<component type="application">
<publisher>Acme Inc</publisher>
From 1572344a73dc04120af269daed3e7a8f07d1765c Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Wed, 22 Jan 2025 10:52:03 +0100
Subject: [PATCH 14/42] docs: docsgen latest first
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
docgen/json/gen.sh | 10 +++++-----
docgen/proto/gen.sh | 8 ++++----
docgen/xml/gen.sh | 14 +++++++-------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/docgen/json/gen.sh b/docgen/json/gen.sh
index d9fd4c7f..c33c5673 100755
--- a/docgen/json/gen.sh
+++ b/docgen/json/gen.sh
@@ -47,9 +47,9 @@ generate () {
sed -i -e "s/\${version}/$version/g" "$OUT_FILE"
}
-generate 1.2
-generate 1.3
-generate 1.4
-generate 1.5
-generate 1.6
generate 1.7
+generate 1.6
+generate 1.5
+generate 1.4
+generate 1.3
+generate 1.2
diff --git a/docgen/proto/gen.sh b/docgen/proto/gen.sh
index c4952c7a..58b78676 100755
--- a/docgen/proto/gen.sh
+++ b/docgen/proto/gen.sh
@@ -42,8 +42,8 @@ generate () {
sed -i -e "s/\${version}/$version/g" "$OUT_DIR/$OUT_FILE"
}
-generate 1.3
-generate 1.4
-generate 1.5
-generate 1.6
generate 1.7
+generate 1.6
+generate 1.5
+generate 1.4
+generate 1.3
diff --git a/docgen/xml/gen.sh b/docgen/xml/gen.sh
index b353f3a9..a61d07c3 100755
--- a/docgen/xml/gen.sh
+++ b/docgen/xml/gen.sh
@@ -38,11 +38,11 @@ generate () {
title="$title"
}
-generate 1.0
-generate 1.1
-generate 1.2
-generate 1.3
-generate 1.4
-generate 1.5
-generate 1.6
generate 1.7
+generate 1.6
+generate 1.5
+generate 1.4
+generate 1.3
+generate 1.2
+generate 1.1
+generate 1.0
From 439f40761784981cc91c0b62668ba59432bdd78f Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Mon, 3 Feb 2025 10:37:55 +0100
Subject: [PATCH 15/42] add CDX 1.7 schema to xmlcatalog
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/xmlcatalog.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/schema/xmlcatalog.xml b/schema/xmlcatalog.xml
index 7eae3fa9..e250aa74 100644
--- a/schema/xmlcatalog.xml
+++ b/schema/xmlcatalog.xml
@@ -34,6 +34,7 @@ limitations under the License.
<uri name="http://cyclonedx.org/schema/bom/1.4" uri="bom-1.4.xsd"/>
<uri name="http://cyclonedx.org/schema/bom/1.5" uri="bom-1.5.xsd"/>
<uri name="http://cyclonedx.org/schema/bom/1.6" uri="bom-1.6.xsd"/>
+ <uri name="http://cyclonedx.org/schema/bom/1.7" uri="bom-1.7.xsd"/>
<!-- Placeholder for future schemas, where 1.x is the next CycloneDX Spec Version -->
<!-- <uri name="http://cyclonedx.org/schema/bom/1.x" uri="bom-1.x.xsd"/> -->
From 4162876af728b3f01ac9acf573e5d095d26ec2ee Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Mon, 3 Feb 2025 10:44:05 +0100
Subject: [PATCH 16/42] forward-port #581
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.xsd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 173634c9..ae468665 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -76,7 +76,7 @@ limitations under the License.
<xs:simpleType name="versionRangeType">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
- A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst
+ A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst
Example values:
- "vers:cargo/9.0.14"
@@ -4477,7 +4477,7 @@ limitations under the License.
</xs:element>
<xs:element name="range" type="bom:versionRangeType" minOccurs="1" maxOccurs="1">
<xs:annotation>
- <xs:documentation>A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst</xs:documentation>
+ <xs:documentation>A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst</xs:documentation>
</xs:annotation>
</xs:element>
</xs:choice>
From 76f2b2c73e0e35f7fec6f3004922d5d7f44160c8 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Mon, 3 Feb 2025 13:06:45 +0100
Subject: [PATCH 17/42] forward-port #581
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.proto | 2 +-
schema/bom-1.7.schema.json | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index 4677eb5b..2f1aaf0d 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -1093,7 +1093,7 @@ message VulnerabilityAffectedVersions {
oneof choice {
// A single version of a component or service.
string version = 1;
- // A version range specified in Package URL Version Range syntax (vers), which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst
+ // A version range specified in Package URL Version Range syntax (vers), which is defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst
string range = 2;
}
// The vulnerability status for the version or range of versions. Defaults to VULNERABILITY_AFFECTED_STATUS_AFFECTED if not specified.
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index 2a8e13ab..e1dd5b1d 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -2928,7 +2928,7 @@
},
"range": {
"title": "Version Range",
- "description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst",
+ "description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst",
"$ref": "#/definitions/versionRange"
},
"status": {
@@ -2983,7 +2983,7 @@
]
},
"versionRange": {
- "description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst",
+ "description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst",
"type": "string",
"minLength": 1,
"maxLength": 4096,
From 4aef00553299be84d603db54d1d8c331a88662ff Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Wed, 22 Oct 2025 17:22:34 +0200
Subject: [PATCH 18/42] draft: JSON - extraneous comp and version range
related to https://github.com/CycloneDX/specification/issues/321 #321
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.schema.json | 23 ++++++++++++++++++-
.../invalid-component-version-and-range.json | 15 ++++++++++++
...-versionRange-non-extraneous-explicit.json | 15 ++++++++++++
...-versionRange-non-extraneous-implicit.json | 14 +++++++++++
...ent-extraneous-no-version-information.json | 14 +++++++++++
...lid-component-extraneous-with-version.json | 15 ++++++++++++
...omponent-extraneous-with-versionRange.json | 15 ++++++++++++
7 files changed, 110 insertions(+), 1 deletion(-)
create mode 100644 tools/src/test/resources/1.7/invalid-component-version-and-range.json
create mode 100644 tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
create mode 100644 tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
create mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
create mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
create mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index e1dd5b1d..1cd1c01a 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -925,6 +925,10 @@
"title": "Component Version",
"description": "The component version. The version should ideally comply with semantic versioning but is not enforced."
},
+ "versionRange": {
+ "$ref": "#/definitions/versionRange",
+ "title": "Component Version Range"
+ },
"description": {
"type": "string",
"title": "Component Description",
@@ -946,6 +950,12 @@
"description": "Specifies the scope of the component. If scope is not specified, 'required' scope SHOULD be assumed by the consumer of the BOM.",
"default": "required"
},
+ "isExtraneous": {
+ "type": "boolean",
+ "title": "Component Is Extraneous",
+ "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but are (expected to be) provided by the environment, regardless of the component's `scope`.",
+ "default": false
+ },
"hashes": {
"type": "array",
"title": "Component Hashes",
@@ -1096,7 +1106,18 @@
"title": "Signature",
"description": "Enveloped signature in [JSON Signature Format (JSF)](https://cyberphone.github.io/doc/security/jsf.html)."
}
- }
+ },
+ "allOf": [
+ {
+ "$comment": "property `version` and `versionRange` MUST NOT exist at the same time.",
+ "not": { "required": ["version", "versionRange"] }
+ },
+ {
+ "$comment": "`version-range` MUST only be present, if `isExtraneous` is `true`",
+ "if": { "properties": { "isExtraneous": { "const": false } } },
+ "then": { "not": { "required": ["versionRange"] } }
+ }
+ ]
},
"swid": {
"type": "object",
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.json b/tools/src/test/resources/1.7/invalid-component-version-and-range.json
new file mode 100644
index 00000000..04d7ef97
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-component-version-and-range.json
@@ -0,0 +1,15 @@
+{
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.7",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "InvalidVersions",
+ "description": "may have `version` or `versionRange`, not both. This one does - it is invalid",
+ "version": "9.0.14",
+ "versionRange": ">=9.0.0|<10.0.0"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
new file mode 100644
index 00000000..fd6ba5bc
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
@@ -0,0 +1,15 @@
+{
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.7",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "InvalidVersions",
+ "description": "versionRange may only exist on extraneous components, set `isExtraneous` explicit",
+ "isExtraneous": false,
+ "versionRange": ">=9.0.0|<10.0.0"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
new file mode 100644
index 00000000..7cca0385
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
@@ -0,0 +1,14 @@
+{
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.7",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "InvalidVersions",
+ "description": "versionRange may only exist on extraneous components, set `isExtraneous` implicit by default value",
+ "versionRange": ">=9.0.0|<10.0.0"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
new file mode 100644
index 00000000..de9632fd
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
@@ -0,0 +1,14 @@
+{
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.7",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "Foo",
+ "description": "extraneous without any version constraints",
+ "isExtraneous": true
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
new file mode 100644
index 00000000..95f21253
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
@@ -0,0 +1,15 @@
+{
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.7",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "Foo",
+ "description": "extraneous with version constraint",
+ "isExtraneous": true,
+ "version": "9.1.24"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
new file mode 100644
index 00000000..9d0c117d
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
@@ -0,0 +1,15 @@
+{
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.7",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "Foo",
+ "description": "extraneous with version range constraints",
+ "isExtraneous": true,
+ "versionRange": ">=9.0.0|<10.0.0"
+ }
+ ]
+}
From a6941dfa866d6423a55d6331947182e4800fec45 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Sun, 22 Oct 2023 20:49:16 +0200
Subject: [PATCH 19/42] docs
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.schema.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index 1cd1c01a..cc8b206c 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -927,7 +927,8 @@
},
"versionRange": {
"$ref": "#/definitions/versionRange",
- "title": "Component Version Range"
+ "title": "Component Version Range",
+ "description": "The component version range that may be provided to fulfill this capability.\nMay only occur if `isExtraneous` is `true`."
},
"description": {
"type": "string",
From 7ede07a73f04efd7db3110ae7ef38a93d25814ab Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Mon, 23 Oct 2023 11:16:35 +0200
Subject: [PATCH 20/42] xml
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.schema.json | 5 +--
schema/bom-1.7.xsd | 36 +++++++++++++++----
...t-versionRange-non-extraneous-explicit.xml | 16 +++++++++
...t-versionRange-non-extraneous-implicit.xml | 17 +++++++++
.../invalid-component-version-and-range.xml | 13 +++++++
...nent-extraneous-no-version-information.xml | 11 ++++++
...alid-component-extraneous-with-version.xml | 12 +++++++
...component-extraneous-with-versionRange.xml | 12 +++++++
8 files changed, 114 insertions(+), 8 deletions(-)
create mode 100644 tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml
create mode 100644 tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml
create mode 100644 tools/src/test/resources/1.7/invalid-component-version-and-range.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index cc8b206c..fb58b604 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -928,7 +928,7 @@
"versionRange": {
"$ref": "#/definitions/versionRange",
"title": "Component Version Range",
- "description": "The component version range that may be provided to fulfill this capability.\nMay only occur if `isExtraneous` is `true`."
+ "description": "The component version range that may be provided to fulfill this capability.\nMAY only occur if `isExtraneous` is `true`."
},
"description": {
"type": "string",
@@ -1116,7 +1116,8 @@
{
"$comment": "`version-range` MUST only be present, if `isExtraneous` is `true`",
"if": { "properties": { "isExtraneous": { "const": false } } },
- "then": { "not": { "required": ["versionRange"] } }
+ "then": { "not": { "required": ["versionRange"] } },
+ "else": true
}
]
},
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index ae468665..baf99201 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -554,12 +554,20 @@ limitations under the License.
of the component. Examples: commons-lang3 and jquery</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="version" type="bom:versionType" minOccurs="0" maxOccurs="1">
- <xs:annotation>
- <xs:documentation>The component version. The version should ideally comply with semantic versioning
- but is not enforced.</xs:documentation>
- </xs:annotation>
- </xs:element>
+ <xs:choice>
+ <xs:element name="version" type="bom:versionType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The component version. The version should ideally comply with semantic versioning
+ but is not enforced.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="versionRange" type="bom:versionRangeType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>The component version range that may be provided to fulfill this capability.
+ MAY only occur if `isExtraneous` is `true`.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
<xs:element name="description" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>Specifies a description for the component</xs:documentation>
@@ -753,12 +761,28 @@ limitations under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="isExtraneous" type="xs:boolean" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ Whether this component is extraneous.
+ An extraneous component is not part of an assembly, but are (expected to be) provided by the environment, regardless of the component's `scope`.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:anyAttribute namespace="##any" processContents="lax">
<xs:annotation>
<xs:documentation>User-defined attributes may be used on this element as long as they
do not have the same name as an existing attribute used by the schema.</xs:documentation>
</xs:annotation>
</xs:anyAttribute>
+ <!--
+ this would be formal, if the support for XSD1.1's `assert` was properly implemented
+ in validators and tools digesting XML.
+ <xs:assert id="versionRange_requires_isExtraneous_eq_true"
+ test="if (versionRange) then (@isExtraneous eq 'true') else true()">
+ child `versionRange` MAY only be present, if attribute `isExtraneous` is `true`
+ </xs:assert>
+ -->
</xs:complexType>
<xs:complexType name="licenseType">
diff --git a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml
new file mode 100644
index 00000000..6d92fb1c
--- /dev/null
+++ b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+ serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
+>
+ <!--
+ this would be formal, if the support for XSD1.1's `assert` was properly implemented
+ in validators and tools digesting XML.
+ -->
+ <components>
+ <component type="library" isExtraneous="false">
+ <name>InvalidVersions</name>
+ <versionRange><![CDATA[>=9.0.0|<10.0.0]]></versionRange>
+ <description>versionRange may only exist on extraneous components, set `isExtraneous` explicit</description>
+ </component>
+ </components>
+</bom>
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml
new file mode 100644
index 00000000..fd6bab97
--- /dev/null
+++ b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+ serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
+>
+ <!--
+ this would be formal, if the support for XSD1.1's `assert` was properly implemented
+ in validators and tools digesting XML.
+ -->
+ <components>
+ <component type="library">
+ <!-- @isExtraneous defaults to `false` -->
+ <name>InvalidVersions</name>
+ <versionRange><![CDATA[>=9.0.0|<10.0.0]]></versionRange>
+ <description>versionRange may only exist on extraneous components, set `isExtraneous` implicit by default value</description>
+ </component>
+ </components>
+</bom>
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.xml b/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
new file mode 100644
index 00000000..a2588189
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+ serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
+>
+ <components>
+ <component type="library" isExtraneous="false">
+ <name>InvalidVersions</name>
+ <version>9.0.14</version>
+ <versionRange><![CDATA[>=9.0.0|<10.0.0]]></versionRange>
+ <description>may have `version` or `versionRange`, not both. This one does - it is invalid</description>
+ </component>
+ </components>
+</bom>
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml
new file mode 100644
index 00000000..18d7c39b
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+ serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
+>
+ <components>
+ <component type="library" isExtraneous="true">
+ <name>Foo</name>
+ <description>extraneous without any version constraints</description>
+ </component>
+ </components>
+</bom>
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml
new file mode 100644
index 00000000..dcedfdd6
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+ serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
+>
+ <components>
+ <component type="library" isExtraneous="true">
+ <name>Foo</name>
+ <version>9.1.24</version>
+ <description>extraneous with version constraint</description>
+ </component>
+ </components>
+</bom>
\ No newline at end of file
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
new file mode 100644
index 00000000..b2c32d09
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+ serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
+>
+ <components>
+ <component type="library" isExtraneous="true">
+ <name>Foo</name>
+ <versionRange><![CDATA[>=9.0.0|<10.0.0]]></versionRange>
+ <description>extraneous with version range constraints</description>
+ </component>
+ </components>
+</bom>
\ No newline at end of file
From 84a97834195af066feee59d66d45da2716404373 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Tue, 16 Jan 2024 13:55:53 +0100
Subject: [PATCH 21/42] docs
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.schema.json | 3 ++-
schema/bom-1.7.xsd | 13 ++++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index fb58b604..8d4fcc8e 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -928,7 +928,8 @@
"versionRange": {
"$ref": "#/definitions/versionRange",
"title": "Component Version Range",
- "description": "The component version range that may be provided to fulfill this capability.\nMAY only occur if `isExtraneous` is `true`."
+ "description": "The component version range that may be provided to fulfill this capability.\nMAY only occur if property `isExtraneous` is set to 'true'.",
+ "$comment": "a rule is taking cate of the plausibility between `version`/`versionRange` and `isExtraneous`=='true'"
},
"description": {
"type": "string",
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index baf99201..3dbfba5a 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -564,7 +564,11 @@ limitations under the License.
<xs:element name="versionRange" type="bom:versionRangeType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>The component version range that may be provided to fulfill this capability.
- MAY only occur if `isExtraneous` is `true`.</xs:documentation>
+ MAY only occur if attribute `isExtraneous` is set to `true`.</xs:documentation>
+ <!-- Attention:
+ Since XSD 1.1 `asserts` are mostly not implemented, there is currently no rule in this XSD,
+ that is taking cate of the plausibility between `version`/`versionRange` and `isExtraneous`=='true'
+ -->
</xs:annotation>
</xs:element>
</xs:choice>
@@ -775,12 +779,11 @@ limitations under the License.
do not have the same name as an existing attribute used by the schema.</xs:documentation>
</xs:annotation>
</xs:anyAttribute>
- <!--
- this would be formal, if the support for XSD1.1's `assert` was properly implemented
- in validators and tools digesting XML.
+ <!-- Attention:
+ This would be formal, if the support for XSD1.1's `assert` was properly implemented in validators and tools digesting XML.
<xs:assert id="versionRange_requires_isExtraneous_eq_true"
test="if (versionRange) then (@isExtraneous eq 'true') else true()">
- child `versionRange` MAY only be present, if attribute `isExtraneous` is `true`
+ Child `versionRange` MAY only be present, if attribute `isExtraneous` is 'true'.
</xs:assert>
-->
</xs:complexType>
From 7a52828433bfcd2b1809bc00d26feba08f9b9713 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Tue, 16 Jan 2024 14:22:04 +0100
Subject: [PATCH 22/42] docs
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.xsd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 3dbfba5a..216dbbd2 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -566,7 +566,7 @@ limitations under the License.
<xs:documentation>The component version range that may be provided to fulfill this capability.
MAY only occur if attribute `isExtraneous` is set to `true`.</xs:documentation>
<!-- Attention:
- Since XSD 1.1 `asserts` are mostly not implemented, there is currently no rule in this XSD,
+ Since XSD 1.1 `asserts` are mostly not implemented, there is currently no rule in this XSD
that is taking cate of the plausibility between `version`/`versionRange` and `isExtraneous`=='true'
-->
</xs:annotation>
@@ -783,7 +783,7 @@ limitations under the License.
This would be formal, if the support for XSD1.1's `assert` was properly implemented in validators and tools digesting XML.
<xs:assert id="versionRange_requires_isExtraneous_eq_true"
test="if (versionRange) then (@isExtraneous eq 'true') else true()">
- Child `versionRange` MAY only be present, if attribute `isExtraneous` is 'true'.
+ Child `versionRange` MAY only be present, if attribute `isExtraneous`=='true'.
</xs:assert>
-->
</xs:complexType>
From d3e0ed5fa316e1c98e7cd1a2ee4a98f7da99d96a Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@owasp.org>
Date: Wed, 5 Feb 2025 14:58:35 +0100
Subject: [PATCH 23/42] Update schema/bom-1.7.schema.json
Co-authored-by: Piotr P. Karwasz <piotr@github.copernik.eu>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.schema.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index 8d4fcc8e..ae4241df 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -929,7 +929,7 @@
"$ref": "#/definitions/versionRange",
"title": "Component Version Range",
"description": "The component version range that may be provided to fulfill this capability.\nMAY only occur if property `isExtraneous` is set to 'true'.",
- "$comment": "a rule is taking cate of the plausibility between `version`/`versionRange` and `isExtraneous`=='true'"
+ "$comment": "a rule is taking care of the coherence between `version`/`versionRange` and `isExtraneous`=='true'"
},
"description": {
"type": "string",
From 045a6de3e53ee38a55d5e93c7a138fbd266747c3 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Wed, 5 Feb 2025 17:18:43 +0100
Subject: [PATCH 24/42] wip
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.schema.json | 41 ++++++++++++------
schema/bom-1.7.xsd | 43 +++++++++++--------
.../invalid-component-version-and-range.json | 4 +-
.../invalid-component-version-and-range.xml | 4 +-
...-versionRange-non-extraneous-explicit.json | 3 +-
...-versionRange-non-extraneous-implicit.json | 3 +-
.../invalid-root-component-extraneous.json | 15 +++++++
.../1.7/invalid-root-component-extraneous.xml | 11 +++++
...ent-extraneous-no-version-information.json | 1 +
...lid-component-extraneous-with-version.json | 1 +
...omponent-extraneous-with-versionRange.json | 1 +
11 files changed, 91 insertions(+), 36 deletions(-)
create mode 100644 tools/src/test/resources/1.7/invalid-root-component-extraneous.json
create mode 100644 tools/src/test/resources/1.7/invalid-root-component-extraneous.xml
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index ae4241df..bc2c9a65 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -689,7 +689,19 @@
"component": {
"title": "Component",
"description": "The component that the BOM describes.",
- "$ref": "#/definitions/component"
+ "allOf": [
+ {
+ "$ref": "#/definitions/component"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "isExtraneous": {
+ "const": false
+ }
+ }
+ }
+ ]
},
"manufacture": {
"deprecated": true,
@@ -920,17 +932,23 @@
"description": "The name of the component. This will often be a shortened, single name of the component. Examples: commons-lang3 and jquery",
"examples": ["tomcat-catalina"]
},
- "version": {
- "$ref": "#/definitions/version",
- "title": "Component Version",
- "description": "The component version. The version should ideally comply with semantic versioning but is not enforced."
+ "isExtraneous": {
+ "type": "boolean",
+ "title": "Component Is Extraneous",
+ "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.\nMUST NOT be of value `false` for `$.metadata.component`.",
+ "default": false
},
"versionRange": {
"$ref": "#/definitions/versionRange",
"title": "Component Version Range",
- "description": "The component version range that may be provided to fulfill this capability.\nMAY only occur if property `isExtraneous` is set to 'true'.",
+ "description": "A version range to fulfill this capability, specified in Package URL Version Range syntax (vers) which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.\nMAY only occur if property `.isExtraneous` is set to 'true'.\nMUST NOT be used for `$.metadata.component`.",
"$comment": "a rule is taking care of the coherence between `version`/`versionRange` and `isExtraneous`=='true'"
},
+ "version": {
+ "$ref": "#/definitions/version",
+ "title": "Component Version",
+ "description": "The component version. The version should ideally comply with semantic versioning but is not enforced."
+ },
"description": {
"type": "string",
"title": "Component Description",
@@ -952,12 +970,6 @@
"description": "Specifies the scope of the component. If scope is not specified, 'required' scope SHOULD be assumed by the consumer of the BOM.",
"default": "required"
},
- "isExtraneous": {
- "type": "boolean",
- "title": "Component Is Extraneous",
- "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but are (expected to be) provided by the environment, regardless of the component's `scope`.",
- "default": false
- },
"hashes": {
"type": "array",
"title": "Component Hashes",
@@ -1111,11 +1123,12 @@
},
"allOf": [
{
- "$comment": "property `version` and `versionRange` MUST NOT exist at the same time.",
+
+ "$comment": "properties `.version` and `.versionRange` MUST NOT exist at the same time.",
"not": { "required": ["version", "versionRange"] }
},
{
- "$comment": "`version-range` MUST only be present, if `isExtraneous` is `true`",
+ "$comment": "`.versionRange` MUST only be present if `.isExtraneous` is `true`",
"if": { "properties": { "isExtraneous": { "const": false } } },
"then": { "not": { "required": ["versionRange"] } },
"else": true
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 216dbbd2..0173705b 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -211,10 +211,17 @@ limitations under the License.
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="component" type="bom:component" minOccurs="0">
+ <xs:element name="component" minOccurs="0">
<xs:annotation>
<xs:documentation>The component that the BOM describes.</xs:documentation>
</xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="bom:component">
+ <xs:attribute name="isExtraneous" type="xs:boolean" fixed="false"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
</xs:element>
<xs:element name="manufacturer" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
<xs:annotation>
@@ -554,22 +561,23 @@ limitations under the License.
of the component. Examples: commons-lang3 and jquery</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:choice>
- <xs:element name="version" type="bom:versionType" minOccurs="0" maxOccurs="1">
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="version" type="bom:versionType">
<xs:annotation>
<xs:documentation>The component version. The version should ideally comply with semantic versioning
but is not enforced.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="versionRange" type="bom:versionRangeType" minOccurs="0" maxOccurs="1">
+ <xs:element name="versionRange" type="bom:versionRangeType">
<xs:annotation>
- <xs:documentation>The component version range that may be provided to fulfill this capability.
- MAY only occur if attribute `isExtraneous` is set to `true`.</xs:documentation>
- <!-- Attention:
- Since XSD 1.1 `asserts` are mostly not implemented, there is currently no rule in this XSD
- that is taking cate of the plausibility between `version`/`versionRange` and `isExtraneous`=='true'
- -->
- </xs:annotation>
+ <xs:documentation><![CDATA[
+ A version range to fulfill this capability, specified in Package URL Version Range syntax (vers) which is defined at
+ <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
+ The component version range that may be provided to fulfill this capability.
+ MAY only occur if attribute `.@isExtraneous` is set to `true`.
+ MUST NOT be used for `/metadata/component`.
+ ]]></xs:documentation>
+ </xs:annotation>
</xs:element>
</xs:choice>
<xs:element name="description" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
@@ -757,19 +765,20 @@ limitations under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="bom-ref" type="bom:refType">
+ <xs:attribute name="isExtraneous" type="xs:boolean" default="false">
<xs:annotation>
<xs:documentation>
- An optional identifier which can be used to reference the component elsewhere in the BOM.
- Uniqueness is enforced within all elements and children of the root-level bom element.
+ Whether this component is extraneous.
+ An extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.
+ MUST NOT be of value `false` for `/metadata/component`.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="isExtraneous" type="xs:boolean" default="false">
+ <xs:attribute name="bom-ref" type="bom:refType">
<xs:annotation>
<xs:documentation>
- Whether this component is extraneous.
- An extraneous component is not part of an assembly, but are (expected to be) provided by the environment, regardless of the component's `scope`.
+ An optional identifier which can be used to reference the component elsewhere in the BOM.
+ Uniqueness is enforced within all elements and children of the root-level bom element.
</xs:documentation>
</xs:annotation>
</xs:attribute>
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.json b/tools/src/test/resources/1.7/invalid-component-version-and-range.json
index 04d7ef97..08610794 100644
--- a/tools/src/test/resources/1.7/invalid-component-version-and-range.json
+++ b/tools/src/test/resources/1.7/invalid-component-version-and-range.json
@@ -1,4 +1,5 @@
{
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
@@ -9,7 +10,8 @@
"name": "InvalidVersions",
"description": "may have `version` or `versionRange`, not both. This one does - it is invalid",
"version": "9.0.14",
- "versionRange": ">=9.0.0|<10.0.0"
+ "versionRange": ">=9.0.0|<10.0.0",
+ "isExtraneous": true
}
]
}
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.xml b/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
index a2588189..7c32220e 100644
--- a/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
+++ b/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
@@ -3,11 +3,11 @@
serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
>
<components>
- <component type="library" isExtraneous="false">
+ <component type="library" isExtraneous="true">
<name>InvalidVersions</name>
<version>9.0.14</version>
<versionRange><![CDATA[>=9.0.0|<10.0.0]]></versionRange>
<description>may have `version` or `versionRange`, not both. This one does - it is invalid</description>
</component>
</components>
-</bom>
\ No newline at end of file
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
index fd6ba5bc..6e0e95c2 100644
--- a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
+++ b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
@@ -1,4 +1,5 @@
{
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
@@ -7,7 +8,7 @@
{
"type": "library",
"name": "InvalidVersions",
- "description": "versionRange may only exist on extraneous components, set `isExtraneous` explicit",
+ "description": "versionRange may only exist on extraneous components; set `.isExtraneous` explicit",
"isExtraneous": false,
"versionRange": ">=9.0.0|<10.0.0"
}
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
index 7cca0385..8c2647e7 100644
--- a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
+++ b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
@@ -1,4 +1,5 @@
{
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
@@ -7,7 +8,7 @@
{
"type": "library",
"name": "InvalidVersions",
- "description": "versionRange may only exist on extraneous components, set `isExtraneous` implicit by default value",
+ "description": "versionRange may only exist on extraneous components; set `.isExtraneous` implicit by default value",
"versionRange": ">=9.0.0|<10.0.0"
}
]
diff --git a/tools/src/test/resources/1.7/invalid-root-component-extraneous.json b/tools/src/test/resources/1.7/invalid-root-component-extraneous.json
new file mode 100644
index 00000000..ab581558
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-root-component-extraneous.json
@@ -0,0 +1,15 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.7",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "component": {
+ "type": "library",
+ "name": "InvalidExtraneousRootComponent",
+ "description": "root component MUST NOT be extraneous",
+ "isExtraneous": true
+ }
+ }
+}
diff --git a/tools/src/test/resources/1.7/invalid-root-component-extraneous.xml b/tools/src/test/resources/1.7/invalid-root-component-extraneous.xml
new file mode 100644
index 00000000..0d0fcd11
--- /dev/null
+++ b/tools/src/test/resources/1.7/invalid-root-component-extraneous.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+ serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
+>
+ <metadata>
+ <component type="library" isExtraneous="true">
+ <name>InvalidExtraneousRootComponent</name>
+ <description>root component MUST NOT be extraneous</description>
+ </component>
+ </metadata>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
index de9632fd..4a60e0a0 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
@@ -1,4 +1,5 @@
{
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
index 95f21253..a5bc6a25 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
@@ -1,4 +1,5 @@
{
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
index 9d0c117d..ba363fdc 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
@@ -1,4 +1,5 @@
{
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.7",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
From 0971f02dc5eb30b1317b1bd19ed9ac66c1b5c686 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Wed, 5 Feb 2025 18:33:55 +0100
Subject: [PATCH 25/42] wip
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.schema.json | 15 +--------------
schema/bom-1.7.xsd | 11 ++---------
2 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index bc2c9a65..a4eb6e19 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -689,19 +689,7 @@
"component": {
"title": "Component",
"description": "The component that the BOM describes.",
- "allOf": [
- {
- "$ref": "#/definitions/component"
- },
- {
- "type": "object",
- "properties": {
- "isExtraneous": {
- "const": false
- }
- }
- }
- ]
+ "$ref": "#/definitions/component"
},
"manufacture": {
"deprecated": true,
@@ -1123,7 +1111,6 @@
},
"allOf": [
{
-
"$comment": "properties `.version` and `.versionRange` MUST NOT exist at the same time.",
"not": { "required": ["version", "versionRange"] }
},
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 0173705b..aa70202f 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -211,17 +211,10 @@ limitations under the License.
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="component" minOccurs="0">
+ <xs:element name="component" type="bom:component" minOccurs="0">
<xs:annotation>
<xs:documentation>The component that the BOM describes.</xs:documentation>
</xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="bom:component">
- <xs:attribute name="isExtraneous" type="xs:boolean" fixed="false"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
</xs:element>
<xs:element name="manufacturer" type="bom:organizationalEntity" minOccurs="0" maxOccurs="1">
<xs:annotation>
@@ -765,7 +758,7 @@ limitations under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="isExtraneous" type="xs:boolean" default="false">
+ <xs:attribute name="isExtraneous" type="xs:boolean" use="optional" default="false">
<xs:annotation>
<xs:documentation>
Whether this component is extraneous.
From b12bd49eb093135d6f9f88903f89639be6b81351 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 6 Feb 2025 09:18:53 +0100
Subject: [PATCH 26/42] wip
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.schema.json | 2 +-
schema/bom-1.7.xsd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index a4eb6e19..4724273c 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -923,7 +923,7 @@
"isExtraneous": {
"type": "boolean",
"title": "Component Is Extraneous",
- "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.\nMUST NOT be of value `false` for `$.metadata.component`.",
+ "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.\nMUST be of value `false` for `$.metadata.component`.",
"default": false
},
"versionRange": {
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index aa70202f..b2c47ecf 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -763,7 +763,7 @@ limitations under the License.
<xs:documentation>
Whether this component is extraneous.
An extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.
- MUST NOT be of value `false` for `/metadata/component`.
+ MUST be of value `false` for `/metadata/component`.
</xs:documentation>
</xs:annotation>
</xs:attribute>
From 2c0037485ee7a7804cfa77b27c55aeb8c0388253 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 6 Feb 2025 09:20:15 +0100
Subject: [PATCH 27/42] wip
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
.../1.7/invalid-root-component-extraneous.json | 15 ---------------
.../1.7/invalid-root-component-extraneous.xml | 11 -----------
2 files changed, 26 deletions(-)
delete mode 100644 tools/src/test/resources/1.7/invalid-root-component-extraneous.json
delete mode 100644 tools/src/test/resources/1.7/invalid-root-component-extraneous.xml
diff --git a/tools/src/test/resources/1.7/invalid-root-component-extraneous.json b/tools/src/test/resources/1.7/invalid-root-component-extraneous.json
deleted file mode 100644
index ab581558..00000000
--- a/tools/src/test/resources/1.7/invalid-root-component-extraneous.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
- "bomFormat": "CycloneDX",
- "specVersion": "1.7",
- "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
- "version": 1,
- "metadata": {
- "component": {
- "type": "library",
- "name": "InvalidExtraneousRootComponent",
- "description": "root component MUST NOT be extraneous",
- "isExtraneous": true
- }
- }
-}
diff --git a/tools/src/test/resources/1.7/invalid-root-component-extraneous.xml b/tools/src/test/resources/1.7/invalid-root-component-extraneous.xml
deleted file mode 100644
index 0d0fcd11..00000000
--- a/tools/src/test/resources/1.7/invalid-root-component-extraneous.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
- serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
->
- <metadata>
- <component type="library" isExtraneous="true">
- <name>InvalidExtraneousRootComponent</name>
- <description>root component MUST NOT be extraneous</description>
- </component>
- </metadata>
-</bom>
From db0b3b8cbc5e0a829817ad23a204c8e8e9cc4c20 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 6 Feb 2025 09:54:33 +0100
Subject: [PATCH 28/42] wip
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.proto | 17 ++++++++++++++--
schema/bom-1.7.schema.json | 20 +++++++++----------
schema/bom-1.7.xsd | 6 +++---
...omponent-extraneous-with-version.textproto | 13 ++++++++++++
...ent-extraneous-with-versionRange.textproto | 13 ++++++++++++
...-component-extraneous-without-version.json | 15 ++++++++++++++
...onent-extraneous-without-version.textproto | 12 +++++++++++
...d-component-extraneous-without-version.xml | 11 ++++++++++
8 files changed, 92 insertions(+), 15 deletions(-)
create mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-without-version.json
create mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index 2f1aaf0d..197df02a 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -106,8 +106,17 @@ message Component {
optional string group = 7;
// The name of the component. This will often be a shortened, single name of the component. Examples: commons-lang3 and jquery
string name = 8;
- // The component version. The version should ideally comply with semantic versioning but is not enforced. Version was made optional in v1.4 of the spec. For backward compatibility, it is recommended to use an empty string to represent components without version information.
- string version = 9;
+ oneof versionChoice {
+ // The component version. The version should ideally comply with semantic versioning but is not enforced.
+ // Version was made optional in v1.4 of the spec.
+ // For backward compatibility, it is recommended to use an empty string to represent components without version information.
+ string version = 9;
+ // For an extraneous component, this is the accepted version range.
+ // Value MUST follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
+ // MAY only occur if property `isExtraneous` is set to 'true'.
+ // MUST NOT be used for `Bom.metadata.component`.
+ string versionRange = 33;
+ }
// Specifies a description for the component
optional string description = 10;
// Specifies the scope of the component. If a scope is not specified, SCOPE_REQUIRED scope should be assumed by the consumer of the BOM
@@ -154,6 +163,10 @@ message Component {
repeated string omniborId = 31;
// Specifies the Software Heritage persistent identifier (SWHID). The SWHID, if specified, must be valid and conform to the specification defined at: https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html
repeated string swhid = 32;
+ // Whether this component is extraneous.
+ // An extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `scope`.
+ // MUST be of value `false` for `Bom.metadata.component`.
+ optional bool isExtraneous = 34; // implicit defaults to `false`
}
// Specifies the data flow.
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index 4724273c..5c0f0170 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -920,22 +920,22 @@
"description": "The name of the component. This will often be a shortened, single name of the component. Examples: commons-lang3 and jquery",
"examples": ["tomcat-catalina"]
},
- "isExtraneous": {
- "type": "boolean",
- "title": "Component Is Extraneous",
- "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.\nMUST be of value `false` for `$.metadata.component`.",
- "default": false
+ "version": {
+ "$ref": "#/definitions/version",
+ "title": "Component Version",
+ "description": "The component version. The version should ideally comply with semantic versioning but is not enforced."
},
"versionRange": {
"$ref": "#/definitions/versionRange",
"title": "Component Version Range",
- "description": "A version range to fulfill this capability, specified in Package URL Version Range syntax (vers) which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.\nMAY only occur if property `.isExtraneous` is set to 'true'.\nMUST NOT be used for `$.metadata.component`.",
+ "description": "For an extraneous component, this is the accepted version range.\nValue MUST follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.\nMAY only occur if property `.isExtraneous` is set to 'true'.\nMUST NOT be used for `$.metadata.component`.",
"$comment": "a rule is taking care of the coherence between `version`/`versionRange` and `isExtraneous`=='true'"
},
- "version": {
- "$ref": "#/definitions/version",
- "title": "Component Version",
- "description": "The component version. The version should ideally comply with semantic versioning but is not enforced."
+ "isExtraneous": {
+ "type": "boolean",
+ "title": "Component Is Extraneous",
+ "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.\nMUST be of value `false` for `$.metadata.component`.",
+ "default": false
},
"description": {
"type": "string",
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index b2c47ecf..64474bf4 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -564,10 +564,10 @@ limitations under the License.
<xs:element name="versionRange" type="bom:versionRangeType">
<xs:annotation>
<xs:documentation><![CDATA[
- A version range to fulfill this capability, specified in Package URL Version Range syntax (vers) which is defined at
- <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
+ For an extraneous component, this is the accepted version range.
+ Value MUST follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
The component version range that may be provided to fulfill this capability.
- MAY only occur if attribute `.@isExtraneous` is set to `true`.
+ MAY only occur if attribute `@isExtraneous` is set to `true`.
MUST NOT be used for `/metadata/component`.
]]></xs:documentation>
</xs:annotation>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto
new file mode 100644
index 00000000..1ef50be4
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto
@@ -0,0 +1,13 @@
+# proto-file: schema/bom-1.7.proto
+# proto-message: Bom
+
+spec_version: "1.7"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "Foo"
+ description: "extraneous with version constraint",
+ isExtraneous: true
+ version: "9.1.24"
+}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
new file mode 100644
index 00000000..db604762
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
@@ -0,0 +1,13 @@
+# proto-file: schema/bom-1.7.proto
+# proto-message: Bom
+
+spec_version: "1.7"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "Foo"
+ description: "extraneous with version range constraints"
+ isExtraneous: true
+ versionRange: ">=9.0.0|<10.0.0"
+}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json
new file mode 100644
index 00000000..7a61f969
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json
@@ -0,0 +1,15 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.7",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "components": [
+ {
+ "type": "library",
+ "name": "Foo",
+ "description": "extraneous without version constraint",
+ "isExtraneous": true
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto
new file mode 100644
index 00000000..f08ce0af
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto
@@ -0,0 +1,12 @@
+# proto-file: schema/bom-1.7.proto
+# proto-message: Bom
+
+spec_version: "1.7"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+components {
+ type: CLASSIFICATION_LIBRARY
+ name: "Foo"
+ description: "extraneous without version constraint",
+ isExtraneous: true
+}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml
new file mode 100644
index 00000000..698fb116
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+ serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
+>
+ <components>
+ <component type="library" isExtraneous="true">
+ <name>Foo</name>
+ <description>extraneous without version constraint</description>
+ </component>
+ </components>
+</bom>
From d2e3053dc455971d9fb6c6126c0f0668fecd7f46 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 6 Feb 2025 09:58:09 +0100
Subject: [PATCH 29/42] wip
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
.../1.7/valid-component-extraneous-with-versionRange.json | 2 +-
.../valid-component-extraneous-with-versionRange.textproto | 2 +-
.../1.7/valid-component-extraneous-with-versionRange.xml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
index ba363fdc..8ef70c7d 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
@@ -10,7 +10,7 @@
"name": "Foo",
"description": "extraneous with version range constraints",
"isExtraneous": true,
- "versionRange": ">=9.0.0|<10.0.0"
+ "versionRange": "vers:gem/>=2.2.0|!= 2.2.1|<2.3.0"
}
]
}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
index db604762..7e2112cb 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
@@ -9,5 +9,5 @@ components {
name: "Foo"
description: "extraneous with version range constraints"
isExtraneous: true
- versionRange: ">=9.0.0|<10.0.0"
+ versionRange: "vers:gem/>=2.2.0|!= 2.2.1|<2.3.0"
}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
index b2c32d09..e9ac1d16 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
@@ -5,8 +5,8 @@
<components>
<component type="library" isExtraneous="true">
<name>Foo</name>
- <versionRange><![CDATA[>=9.0.0|<10.0.0]]></versionRange>
+ <versionRange><![CDATA[vers:gem/>=2.2.0|!= 2.2.1|<2.3.0]]></versionRange>
<description>extraneous with version range constraints</description>
</component>
</components>
-</bom>
\ No newline at end of file
+</bom>
From 401b2450c85dfa7800fe9380d54d688beb3d93b6 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 6 Feb 2025 10:00:52 +0100
Subject: [PATCH 30/42] wip
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
.../1.7/valid-component-extraneous-with-versionRange.json | 2 +-
.../1.7/valid-component-extraneous-with-versionRange.textproto | 2 +-
.../1.7/valid-component-extraneous-with-versionRange.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
index 8ef70c7d..085bb16b 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
@@ -10,7 +10,7 @@
"name": "Foo",
"description": "extraneous with version range constraints",
"isExtraneous": true,
- "versionRange": "vers:gem/>=2.2.0|!= 2.2.1|<2.3.0"
+ "versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
}
]
}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
index 7e2112cb..97e113d0 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
@@ -9,5 +9,5 @@ components {
name: "Foo"
description: "extraneous with version range constraints"
isExtraneous: true
- versionRange: "vers:gem/>=2.2.0|!= 2.2.1|<2.3.0"
+ versionRange: "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
index e9ac1d16..6c5c384c 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
@@ -5,7 +5,7 @@
<components>
<component type="library" isExtraneous="true">
<name>Foo</name>
- <versionRange><![CDATA[vers:gem/>=2.2.0|!= 2.2.1|<2.3.0]]></versionRange>
+ <versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
<description>extraneous with version range constraints</description>
</component>
</components>
From 65ec962dd4b61c7080fa32446c789d3480b21bcb Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 6 Feb 2025 10:06:48 +0100
Subject: [PATCH 31/42] wip
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
...invalid-component-versionRange-non-extraneous-explicit.xml | 4 ++--
...invalid-component-versionRange-non-extraneous-implicit.xml | 4 ++--
.../resources/1.7/invalid-component-version-and-range.json | 2 +-
.../resources/1.7/invalid-component-version-and-range.xml | 2 +-
...nvalid-component-versionRange-non-extraneous-explicit.json | 2 +-
...nvalid-component-versionRange-non-extraneous-implicit.json | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml
index 6d92fb1c..ed719166 100644
--- a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml
+++ b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml
@@ -9,8 +9,8 @@
<components>
<component type="library" isExtraneous="false">
<name>InvalidVersions</name>
- <versionRange><![CDATA[>=9.0.0|<10.0.0]]></versionRange>
+ <versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
<description>versionRange may only exist on extraneous components, set `isExtraneous` explicit</description>
</component>
</components>
-</bom>
\ No newline at end of file
+</bom>
diff --git a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml
index fd6bab97..2bc19639 100644
--- a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml
+++ b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml
@@ -10,8 +10,8 @@
<component type="library">
<!-- @isExtraneous defaults to `false` -->
<name>InvalidVersions</name>
- <versionRange><![CDATA[>=9.0.0|<10.0.0]]></versionRange>
+ <versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
<description>versionRange may only exist on extraneous components, set `isExtraneous` implicit by default value</description>
</component>
</components>
-</bom>
\ No newline at end of file
+</bom>
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.json b/tools/src/test/resources/1.7/invalid-component-version-and-range.json
index 08610794..f06449e6 100644
--- a/tools/src/test/resources/1.7/invalid-component-version-and-range.json
+++ b/tools/src/test/resources/1.7/invalid-component-version-and-range.json
@@ -10,7 +10,7 @@
"name": "InvalidVersions",
"description": "may have `version` or `versionRange`, not both. This one does - it is invalid",
"version": "9.0.14",
- "versionRange": ">=9.0.0|<10.0.0",
+ "versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1",
"isExtraneous": true
}
]
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.xml b/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
index 7c32220e..df53e079 100644
--- a/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
+++ b/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
@@ -6,7 +6,7 @@
<component type="library" isExtraneous="true">
<name>InvalidVersions</name>
<version>9.0.14</version>
- <versionRange><![CDATA[>=9.0.0|<10.0.0]]></versionRange>
+ <versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
<description>may have `version` or `versionRange`, not both. This one does - it is invalid</description>
</component>
</components>
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
index 6e0e95c2..9bd55bc7 100644
--- a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
+++ b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
@@ -10,7 +10,7 @@
"name": "InvalidVersions",
"description": "versionRange may only exist on extraneous components; set `.isExtraneous` explicit",
"isExtraneous": false,
- "versionRange": ">=9.0.0|<10.0.0"
+ "versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
}
]
}
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
index 8c2647e7..d3e80a6c 100644
--- a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
+++ b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
@@ -9,7 +9,7 @@
"type": "library",
"name": "InvalidVersions",
"description": "versionRange may only exist on extraneous components; set `.isExtraneous` implicit by default value",
- "versionRange": ">=9.0.0|<10.0.0"
+ "versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
}
]
}
From 959a82c3716d604c45d13a9a3cd253c79867f9f1 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 6 Feb 2025 10:16:23 +0100
Subject: [PATCH 32/42] wip
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.proto | 8 ++++----
schema/bom-1.7.schema.json | 8 ++++----
schema/bom-1.7.xsd | 10 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index 197df02a..80b1e7fe 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -112,9 +112,9 @@ message Component {
// For backward compatibility, it is recommended to use an empty string to represent components without version information.
string version = 9;
// For an extraneous component, this is the accepted version range.
- // Value MUST follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
- // MAY only occur if property `isExtraneous` is set to 'true'.
- // MUST NOT be used for `Bom.metadata.component`.
+ // Value must follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
+ // May only occur if property `isExtraneous` is set to 'true'.
+ // Must not be used for `Bom.metadata.component`.
string versionRange = 33;
}
// Specifies a description for the component
@@ -165,7 +165,7 @@ message Component {
repeated string swhid = 32;
// Whether this component is extraneous.
// An extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `scope`.
- // MUST be of value `false` for `Bom.metadata.component`.
+ // Must be of value `false` for `Bom.metadata.component`.
optional bool isExtraneous = 34; // implicit defaults to `false`
}
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index 5c0f0170..5ded6f76 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -928,13 +928,13 @@
"versionRange": {
"$ref": "#/definitions/versionRange",
"title": "Component Version Range",
- "description": "For an extraneous component, this is the accepted version range.\nValue MUST follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.\nMAY only occur if property `.isExtraneous` is set to 'true'.\nMUST NOT be used for `$.metadata.component`.",
+ "description": "For an extraneous component, this is the accepted version range.\nValue must follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.\nMay only occur if property `.isExtraneous` is set to 'true'.\nMust not be used for `$.metadata.component`.",
"$comment": "a rule is taking care of the coherence between `version`/`versionRange` and `isExtraneous`=='true'"
},
"isExtraneous": {
"type": "boolean",
"title": "Component Is Extraneous",
- "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.\nMUST be of value `false` for `$.metadata.component`.",
+ "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.\nMust be of value `false` for `$.metadata.component`.",
"default": false
},
"description": {
@@ -1111,11 +1111,11 @@
},
"allOf": [
{
- "$comment": "properties `.version` and `.versionRange` MUST NOT exist at the same time.",
+ "$comment": "properties `.version` and `.versionRange` Mustnot exist at the same time.",
"not": { "required": ["version", "versionRange"] }
},
{
- "$comment": "`.versionRange` MUST only be present if `.isExtraneous` is `true`",
+ "$comment": "`.versionRange` Must only be present if `.isExtraneous` is `true`",
"if": { "properties": { "isExtraneous": { "const": false } } },
"then": { "not": { "required": ["versionRange"] } },
"else": true
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 64474bf4..1bbd5d06 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -565,10 +565,10 @@ limitations under the License.
<xs:annotation>
<xs:documentation><![CDATA[
For an extraneous component, this is the accepted version range.
- Value MUST follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
+ Value must follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
The component version range that may be provided to fulfill this capability.
- MAY only occur if attribute `@isExtraneous` is set to `true`.
- MUST NOT be used for `/metadata/component`.
+ May only occur if attribute `@isExtraneous` is set to `true`.
+ Must not be used for `/metadata/component`.
]]></xs:documentation>
</xs:annotation>
</xs:element>
@@ -763,7 +763,7 @@ limitations under the License.
<xs:documentation>
Whether this component is extraneous.
An extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.
- MUST be of value `false` for `/metadata/component`.
+ Must be of value `false` for `/metadata/component`.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -785,7 +785,7 @@ limitations under the License.
This would be formal, if the support for XSD1.1's `assert` was properly implemented in validators and tools digesting XML.
<xs:assert id="versionRange_requires_isExtraneous_eq_true"
test="if (versionRange) then (@isExtraneous eq 'true') else true()">
- Child `versionRange` MAY only be present, if attribute `isExtraneous`=='true'.
+ Child `versionRange` May only be present, if attribute `isExtraneous`=='true'.
</xs:assert>
-->
</xs:complexType>
From e7d714f16b4dcdd7dda8064cabe9d4d8caf65d33 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 6 Feb 2025 10:16:51 +0100
Subject: [PATCH 33/42] wip
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.proto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index 80b1e7fe..a708205f 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -106,7 +106,7 @@ message Component {
optional string group = 7;
// The name of the component. This will often be a shortened, single name of the component. Examples: commons-lang3 and jquery
string name = 8;
- oneof versionChoice {
+ oneof version_choice {
// The component version. The version should ideally comply with semantic versioning but is not enforced.
// Version was made optional in v1.4 of the spec.
// For backward compatibility, it is recommended to use an empty string to represent components without version information.
From a4622ea8ea64c95fbf694b1d724ab3ee7de0bfd3 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Sat, 8 Feb 2025 12:47:15 +0100
Subject: [PATCH 34/42] spec: isExtraneous only for runtime-components
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.proto | 3 +--
schema/bom-1.7.schema.json | 6 +++---
schema/bom-1.7.xsd | 3 +--
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index a708205f..9c5353f4 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -114,7 +114,6 @@ message Component {
// For an extraneous component, this is the accepted version range.
// Value must follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
// May only occur if property `isExtraneous` is set to 'true'.
- // Must not be used for `Bom.metadata.component`.
string versionRange = 33;
}
// Specifies a description for the component
@@ -165,7 +164,7 @@ message Component {
repeated string swhid = 32;
// Whether this component is extraneous.
// An extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `scope`.
- // Must be of value `false` for `Bom.metadata.component`.
+ // May be set to `true` for runtime components only. Must be of value `false` for `Bom.metadata.component`.
optional bool isExtraneous = 34; // implicit defaults to `false`
}
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index 5ded6f76..f09b6d6e 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -928,13 +928,13 @@
"versionRange": {
"$ref": "#/definitions/versionRange",
"title": "Component Version Range",
- "description": "For an extraneous component, this is the accepted version range.\nValue must follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.\nMay only occur if property `.isExtraneous` is set to 'true'.\nMust not be used for `$.metadata.component`.",
- "$comment": "a rule is taking care of the coherence between `version`/`versionRange` and `isExtraneous`=='true'"
+ "description": "For an extraneous component, this is the accepted version range.\nValue must follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.\nMay only occur if property `.isExtraneous` is set to 'true'.",
+ "$comment": "a rule is taking care of the coherence between `version`/`versionRange` and `isExtraneous==true'"
},
"isExtraneous": {
"type": "boolean",
"title": "Component Is Extraneous",
- "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.\nMust be of value `false` for `$.metadata.component`.",
+ "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.\nMay be set to `true` for runtime components only. Must be of value `false` for `$.metadata.component`.",
"default": false
},
"description": {
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 1bbd5d06..62c44936 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -568,7 +568,6 @@ limitations under the License.
Value must follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
The component version range that may be provided to fulfill this capability.
May only occur if attribute `@isExtraneous` is set to `true`.
- Must not be used for `/metadata/component`.
]]></xs:documentation>
</xs:annotation>
</xs:element>
@@ -763,7 +762,7 @@ limitations under the License.
<xs:documentation>
Whether this component is extraneous.
An extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.
- Must be of value `false` for `/metadata/component`.
+ May be set to `true` for runtime components only. Must be of value `false` for `/metadata/component`.
</xs:documentation>
</xs:annotation>
</xs:attribute>
From c34176d8c8fa2504bacbdb651ba003fe02aa2d3a Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Sat, 8 Feb 2025 13:02:18 +0100
Subject: [PATCH 35/42] rename `isExtranous `-> `isExternal` + wording
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.proto | 14 +++++++-------
schema/bom-1.7.schema.json | 13 ++++++-------
schema/bom-1.7.xsd | 23 +++++++++++------------
3 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index 9c5353f4..d36c0ec1 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -111,9 +111,9 @@ message Component {
// Version was made optional in v1.4 of the spec.
// For backward compatibility, it is recommended to use an empty string to represent components without version information.
string version = 9;
- // For an extraneous component, this is the accepted version range.
- // Value must follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
- // May only occur if property `isExtraneous` is set to 'true'.
+ // For an external component, this specifies the accepted version range.
+ // The value must adhere to the Package URL Version Range syntax (vers), as defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst.
+ // May only be used if `isExternal` is set to `true`.
string versionRange = 33;
}
// Specifies a description for the component
@@ -162,10 +162,10 @@ message Component {
repeated string omniborId = 31;
// Specifies the Software Heritage persistent identifier (SWHID). The SWHID, if specified, must be valid and conform to the specification defined at: https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html
repeated string swhid = 32;
- // Whether this component is extraneous.
- // An extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `scope`.
- // May be set to `true` for runtime components only. Must be of value `false` for `Bom.metadata.component`.
- optional bool isExtraneous = 34; // implicit defaults to `false`
+ // Determine whether this component is external.
+ // An external component is one that is not part of an assembly, but is expected to be provided by the environment, regardless of the component's `scope`. This setting can be useful for distinguishing which components are bundled with the product and which can be relied upon to be present in the deployment environment.
+ // This may be set to `true` for runtime components only. For `Bom.metadata.component`, it must be set to `false`.
+ optional bool isExternal = 34; // implicit defaults to `false`
}
// Specifies the data flow.
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index f09b6d6e..393d45e1 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -928,13 +928,12 @@
"versionRange": {
"$ref": "#/definitions/versionRange",
"title": "Component Version Range",
- "description": "For an extraneous component, this is the accepted version range.\nValue must follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.\nMay only occur if property `.isExtraneous` is set to 'true'.",
- "$comment": "a rule is taking care of the coherence between `version`/`versionRange` and `isExtraneous==true'"
+ "description": "For an external component, this specifies the accepted version range.\nThe value must adhere to the Package URL Version Range syntax (vers), as defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.\nMay only be used if `.isExternal` is set to `true`."
},
- "isExtraneous": {
+ "isExternal": {
"type": "boolean",
- "title": "Component Is Extraneous",
- "description": "Whether this component is extraneous.\nAn extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.\nMay be set to `true` for runtime components only. Must be of value `false` for `$.metadata.component`.",
+ "title": "Component Is External",
+ "description": "Determine whether this component is external.\nAn external component is one that is not part of an assembly, but is expected to be provided by the environment, regardless of the component's `.scope`. This setting can be useful for distinguishing which components are bundled with the product and which can be relied upon to be present in the deployment environment.\nThis may be set to `true` for runtime components only. For `$.metadata.component`, it must be set to `false`.",
"default": false
},
"description": {
@@ -1115,8 +1114,8 @@
"not": { "required": ["version", "versionRange"] }
},
{
- "$comment": "`.versionRange` Must only be present if `.isExtraneous` is `true`",
- "if": { "properties": { "isExtraneous": { "const": false } } },
+ "$comment": "`.versionRange` Must only be present if `.isExternal` is `true`",
+ "if": { "properties": { "isExternal": { "const": false } } },
"then": { "not": { "required": ["versionRange"] } },
"else": true
}
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 62c44936..8e95a6a6 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -564,12 +564,11 @@ limitations under the License.
<xs:element name="versionRange" type="bom:versionRangeType">
<xs:annotation>
<xs:documentation><![CDATA[
- For an extraneous component, this is the accepted version range.
- Value must follow Package URL Version Range syntax (vers)which is defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.
- The component version range that may be provided to fulfill this capability.
- May only occur if attribute `@isExtraneous` is set to `true`.
+ For an external component, this specifies the accepted version range.
+ The value must adhere to the Package URL Version Range syntax (vers), as defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst.
+ May only be used if `@isExternal` is set to `true`.
]]></xs:documentation>
- </xs:annotation>
+ </xs:annotation>
</xs:element>
</xs:choice>
<xs:element name="description" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
@@ -757,12 +756,12 @@ limitations under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="isExtraneous" type="xs:boolean" use="optional" default="false">
+ <xs:attribute name="isExternal" type="xs:boolean" use="optional" default="false">
<xs:annotation>
<xs:documentation>
- Whether this component is extraneous.
- An extraneous component is not part of an assembly, but is (expected to be) provided by the environment, regardless of the component's `.scope`.
- May be set to `true` for runtime components only. Must be of value `false` for `/metadata/component`.
+ Determine whether this component is external.
+ An external component is one that is not part of an assembly, but is expected to be provided by the environment, regardless of the component's `@scope`. This setting can be useful for distinguishing which components are bundled with the product and which can be relied upon to be present in the deployment environment.
+ This may be set to `true` for runtime components only. For `/metadata/component`, it must be set to `false`.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -782,9 +781,9 @@ limitations under the License.
</xs:anyAttribute>
<!-- Attention:
This would be formal, if the support for XSD1.1's `assert` was properly implemented in validators and tools digesting XML.
- <xs:assert id="versionRange_requires_isExtraneous_eq_true"
- test="if (versionRange) then (@isExtraneous eq 'true') else true()">
- Child `versionRange` May only be present, if attribute `isExtraneous`=='true'.
+ <xs:assert id="versionRange_requires_isExternal_eq_true"
+ test="if (versionRange) then (@isExternal eq 'true') else true()">
+ Child `versionRange` May only be present, if attribute `isExternal`=='true'.
</xs:assert>
-->
</xs:complexType>
From 919e49f2fea889e09550448632b07cd966b57352 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Sat, 8 Feb 2025 13:39:08 +0100
Subject: [PATCH 36/42] docs for JSON schema requirements
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.schema.json | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index 393d45e1..bb729abc 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -1110,13 +1110,19 @@
},
"allOf": [
{
- "$comment": "properties `.version` and `.versionRange` Mustnot exist at the same time.",
- "not": { "required": ["version", "versionRange"] }
+ "description": "Requirement: ensure that `version` and `versionRange` are not present simultaneously.",
+ "not": {
+ "required": ["version", "versionRange"]
+ }
},
{
- "$comment": "`.versionRange` Must only be present if `.isExternal` is `true`",
- "if": { "properties": { "isExternal": { "const": false } } },
- "then": { "not": { "required": ["versionRange"] } },
+ "description": "Requirement: 'versionRange' must not be present when 'isExternal' is `false`.",
+ "if": {
+ "properties": { "isExternal": { "const": false } }
+ },
+ "then": {
+ "not": { "required": ["versionRange"] }
+ },
"else": true
}
]
From 21f8f4281125343e9f02cb1678624f384e31cbeb Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Sat, 8 Feb 2025 13:48:00 +0100
Subject: [PATCH 37/42] component's version and versionRange exclusively
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.proto | 20 ++++++++++----------
schema/bom-1.7.schema.json | 4 ++--
schema/bom-1.7.xsd | 3 +++
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto
index d36c0ec1..7b784f07 100644
--- a/schema/bom-1.7.proto
+++ b/schema/bom-1.7.proto
@@ -106,16 +106,16 @@ message Component {
optional string group = 7;
// The name of the component. This will often be a shortened, single name of the component. Examples: commons-lang3 and jquery
string name = 8;
- oneof version_choice {
- // The component version. The version should ideally comply with semantic versioning but is not enforced.
- // Version was made optional in v1.4 of the spec.
- // For backward compatibility, it is recommended to use an empty string to represent components without version information.
- string version = 9;
- // For an external component, this specifies the accepted version range.
- // The value must adhere to the Package URL Version Range syntax (vers), as defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst.
- // May only be used if `isExternal` is set to `true`.
- string versionRange = 33;
- }
+ // The component version. The version should ideally comply with semantic versioning but is not enforced.
+ // Version was made optional in v1.4 of the spec.
+ // For backward compatibility, it is recommended to use an empty string to represent components without version information.
+ // Must be used exclusively, either 'version' or 'versionRange', but not both.
+ string version = 9;
+ // For an external component, this specifies the accepted version range.
+ // The value must adhere to the Package URL Version Range syntax (vers), as defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst.
+ // May only be used if `isExternal` is set to `true`.
+ // Must be used exclusively, either 'version' or 'versionRange', but not both.
+ optional string versionRange = 33;
// Specifies a description for the component
optional string description = 10;
// Specifies the scope of the component. If a scope is not specified, SCOPE_REQUIRED scope should be assumed by the consumer of the BOM
diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json
index bb729abc..9bcae697 100644
--- a/schema/bom-1.7.schema.json
+++ b/schema/bom-1.7.schema.json
@@ -923,12 +923,12 @@
"version": {
"$ref": "#/definitions/version",
"title": "Component Version",
- "description": "The component version. The version should ideally comply with semantic versioning but is not enforced."
+ "description": "The component version. The version should ideally comply with semantic versioning but is not enforced.\nMust be used exclusively, either 'version' or 'versionRange', but not both."
},
"versionRange": {
"$ref": "#/definitions/versionRange",
"title": "Component Version Range",
- "description": "For an external component, this specifies the accepted version range.\nThe value must adhere to the Package URL Version Range syntax (vers), as defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.\nMay only be used if `.isExternal` is set to `true`."
+ "description": "For an external component, this specifies the accepted version range.\nThe value must adhere to the Package URL Version Range syntax (vers), as defined at <https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst>.\nMay only be used if `.isExternal` is set to `true`.\nMust be used exclusively, either 'version' or 'versionRange', but not both."
},
"isExternal": {
"type": "boolean",
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 8e95a6a6..1b531d57 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -555,6 +555,9 @@ limitations under the License.
</xs:annotation>
</xs:element>
<xs:choice minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>Must be used exclusively, either 'version' or 'versionRange', but not both.</xs:documentation>
+ </xs:annotation>
<xs:element name="version" type="bom:versionType">
<xs:annotation>
<xs:documentation>The component version. The version should ideally comply with semantic versioning
From 22c6e753c9f89291ee364e7872bbdf8cf1b7da79 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Sat, 8 Feb 2025 14:02:52 +0100
Subject: [PATCH 38/42] tests
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
...invalid-component-versionRange-non-extraneous-explicit.xml | 4 ++--
...invalid-component-versionRange-non-extraneous-implicit.xml | 4 ++--
.../resources/1.7/invalid-component-version-and-range.json | 2 +-
.../resources/1.7/invalid-component-version-and-range.xml | 2 +-
...nvalid-component-versionRange-non-extraneous-explicit.json | 4 ++--
...nvalid-component-versionRange-non-extraneous-implicit.json | 2 +-
.../valid-component-extraneous-no-version-information.json | 2 +-
.../1.7/valid-component-extraneous-no-version-information.xml | 4 ++--
.../1.7/valid-component-extraneous-with-version.json | 2 +-
.../1.7/valid-component-extraneous-with-version.textproto | 2 +-
.../resources/1.7/valid-component-extraneous-with-version.xml | 4 ++--
.../1.7/valid-component-extraneous-with-versionRange.json | 2 +-
.../valid-component-extraneous-with-versionRange.textproto | 2 +-
.../1.7/valid-component-extraneous-with-versionRange.xml | 2 +-
.../1.7/valid-component-extraneous-without-version.json | 2 +-
.../1.7/valid-component-extraneous-without-version.textproto | 2 +-
.../1.7/valid-component-extraneous-without-version.xml | 2 +-
17 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml
index ed719166..66127f86 100644
--- a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml
+++ b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml
@@ -7,10 +7,10 @@
in validators and tools digesting XML.
-->
<components>
- <component type="library" isExtraneous="false">
+ <component type="library" isExternal="false">
<name>InvalidVersions</name>
<versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
- <description>versionRange may only exist on extraneous components, set `isExtraneous` explicit</description>
+ <description>versionRange may only exist on extraneous components, set `isExternal` explicit</description>
</component>
</components>
</bom>
diff --git a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml
index 2bc19639..f2cb83b2 100644
--- a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml
+++ b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml
@@ -8,10 +8,10 @@
-->
<components>
<component type="library">
- <!-- @isExtraneous defaults to `false` -->
+ <!-- @isExternal defaults to `false` -->
<name>InvalidVersions</name>
<versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
- <description>versionRange may only exist on extraneous components, set `isExtraneous` implicit by default value</description>
+ <description>versionRange may only exist on extraneous components, set `isExternal` implicit by default value</description>
</component>
</components>
</bom>
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.json b/tools/src/test/resources/1.7/invalid-component-version-and-range.json
index f06449e6..e1bc979e 100644
--- a/tools/src/test/resources/1.7/invalid-component-version-and-range.json
+++ b/tools/src/test/resources/1.7/invalid-component-version-and-range.json
@@ -11,7 +11,7 @@
"description": "may have `version` or `versionRange`, not both. This one does - it is invalid",
"version": "9.0.14",
"versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1",
- "isExtraneous": true
+ "isExternal": true
}
]
}
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.xml b/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
index df53e079..6cf3f228 100644
--- a/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
+++ b/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
@@ -3,7 +3,7 @@
serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
>
<components>
- <component type="library" isExtraneous="true">
+ <component type="library" isExternal="true">
<name>InvalidVersions</name>
<version>9.0.14</version>
<versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
index 9bd55bc7..fd8fea18 100644
--- a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
+++ b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
@@ -8,8 +8,8 @@
{
"type": "library",
"name": "InvalidVersions",
- "description": "versionRange may only exist on extraneous components; set `.isExtraneous` explicit",
- "isExtraneous": false,
+ "description": "versionRange may only exist on extraneous components; set `.isExternal` explicit",
+ "isExternal": false,
"versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
}
]
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
index d3e80a6c..1d08d7b8 100644
--- a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
+++ b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
@@ -8,7 +8,7 @@
{
"type": "library",
"name": "InvalidVersions",
- "description": "versionRange may only exist on extraneous components; set `.isExtraneous` implicit by default value",
+ "description": "versionRange may only exist on extraneous components; set `.isExternal` implicit by default value",
"versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
}
]
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
index 4a60e0a0..8fb7df7e 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
@@ -9,7 +9,7 @@
"type": "library",
"name": "Foo",
"description": "extraneous without any version constraints",
- "isExtraneous": true
+ "isExternal": true
}
]
}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml
index 18d7c39b..dbcfb122 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml
@@ -3,9 +3,9 @@
serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
>
<components>
- <component type="library" isExtraneous="true">
+ <component type="library" isExternal="true">
<name>Foo</name>
<description>extraneous without any version constraints</description>
</component>
</components>
-</bom>
\ No newline at end of file
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
index a5bc6a25..e5375cdd 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
@@ -9,7 +9,7 @@
"type": "library",
"name": "Foo",
"description": "extraneous with version constraint",
- "isExtraneous": true,
+ "isExternal": true,
"version": "9.1.24"
}
]
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto
index 1ef50be4..6c46e877 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto
@@ -8,6 +8,6 @@ components {
type: CLASSIFICATION_LIBRARY
name: "Foo"
description: "extraneous with version constraint",
- isExtraneous: true
+ isExternal: true
version: "9.1.24"
}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml
index dcedfdd6..cef8d8d1 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml
@@ -3,10 +3,10 @@
serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
>
<components>
- <component type="library" isExtraneous="true">
+ <component type="library" isExternal="true">
<name>Foo</name>
<version>9.1.24</version>
<description>extraneous with version constraint</description>
</component>
</components>
-</bom>
\ No newline at end of file
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
index 085bb16b..7ea7f295 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
@@ -9,7 +9,7 @@
"type": "library",
"name": "Foo",
"description": "extraneous with version range constraints",
- "isExtraneous": true,
+ "isExternal": true,
"versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
}
]
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
index 97e113d0..a6f39d32 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
@@ -8,6 +8,6 @@ components {
type: CLASSIFICATION_LIBRARY
name: "Foo"
description: "extraneous with version range constraints"
- isExtraneous: true
+ isExternal: true
versionRange: "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
index 6c5c384c..a63ee165 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
@@ -3,7 +3,7 @@
serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
>
<components>
- <component type="library" isExtraneous="true">
+ <component type="library" isExternal="true">
<name>Foo</name>
<versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
<description>extraneous with version range constraints</description>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json
index 7a61f969..dcf80b10 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json
@@ -9,7 +9,7 @@
"type": "library",
"name": "Foo",
"description": "extraneous without version constraint",
- "isExtraneous": true
+ "isExternal": true
}
]
}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto
index f08ce0af..36e4955c 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto
@@ -8,5 +8,5 @@ components {
type: CLASSIFICATION_LIBRARY
name: "Foo"
description: "extraneous without version constraint",
- isExtraneous: true
+ isExternal: true
}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml
index 698fb116..6115869c 100644
--- a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml
+++ b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml
@@ -3,7 +3,7 @@
serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
>
<components>
- <component type="library" isExtraneous="true">
+ <component type="library" isExternal="true">
<name>Foo</name>
<description>extraneous without version constraint</description>
</component>
From 88de88c2e244a177f338c7f90906823e8b4b7b65 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Mon, 17 Feb 2025 20:18:46 +0100
Subject: [PATCH 39/42] tests(Java) 1.7
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
.../org/cyclonedx/schema/JsonSchemaVerificationTest.java | 5 +++++
.../java/org/cyclonedx/schema/XmlSchemaVerificationTest.java | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java
index 4680aefa..adfd59ee 100644
--- a/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java
+++ b/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java
@@ -53,6 +53,7 @@ class JsonSchemaVerificationTest extends BaseSchemaVerificationTest {
private static final JsonSchema VERSION_14;
private static final JsonSchema VERSION_15;
private static final JsonSchema VERSION_16;
+ private static final JsonSchema VERSION_17;
static {
JsonMetaSchemaFactory metaSchemaFactory = new DefaultJsonMetaSchemaFactory() {
@@ -75,6 +76,7 @@ public JsonMetaSchema getMetaSchema(
VERSION_14 = factory.getSchema(SchemaLocation.of("classpath:bom-1.4.schema.json"));
VERSION_15 = factory.getSchema(SchemaLocation.of("classpath:bom-1.5.schema.json"));
VERSION_16 = factory.getSchema(SchemaLocation.of("classpath:bom-1.6.schema.json"));
+ VERSION_17 = factory.getSchema(SchemaLocation.of("classpath:bom-1.7.schema.json"));
}
private static JsonMetaSchema addCustomKeywords(JsonMetaSchema metaSchema) {
@@ -134,6 +136,9 @@ private JsonSchema getSchema(String resourceName) {
if (resourceName.endsWith("-1.6.json")) {
return VERSION_16;
}
+ if (resourceName.endsWith("-1.7.json")) {
+ return VERSION_17;
+ }
return null;
}
}
diff --git a/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java
index 348d9e5b..092aa377 100644
--- a/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java
+++ b/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java
@@ -40,6 +40,7 @@ public class XmlSchemaVerificationTest extends BaseSchemaVerificationTest {
private static final Schema VERSION_14;
private static final Schema VERSION_15;
private static final Schema VERSION_16;
+ private static final Schema VERSION_17;
static {
try {
@@ -57,6 +58,7 @@ public class XmlSchemaVerificationTest extends BaseSchemaVerificationTest {
VERSION_14 = factory.newSchema(cl.getResource("bom-1.4.xsd"));
VERSION_15 = factory.newSchema(cl.getResource("bom-1.5.xsd"));
VERSION_16 = factory.newSchema(cl.getResource("bom-1.6.xsd"));
+ VERSION_17 = factory.newSchema(cl.getResource("bom-1.7.xsd"));
} catch (SAXException e) {
throw new IllegalStateException(e);
}
@@ -146,6 +148,9 @@ private Schema getSchema(String resourceName) {
if (resourceName.endsWith("-1.6.xml")) {
return VERSION_16;
}
+ if (resourceName.endsWith("-1.7.xml")) {
+ return VERSION_17;
+ }
return null;
}
}
From 9f08878831c4b652dd7bf2b4e001e9e1e326b9fd Mon Sep 17 00:00:00 2001
From: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Date: Fri, 21 Feb 2025 23:16:36 +0100
Subject: [PATCH 40/42] Fix missing type definitions for ComponentData
subelements
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
---
schema/bom-1.7.xsd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index ae468665..594d2bfb 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -3931,7 +3931,7 @@ limitations under the License.
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="sensitiveData" minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="sensitiveData" type="xs:string" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
A description of any sensitive data in a dataset.
@@ -4020,7 +4020,7 @@ limitations under the License.
</xs:documentation>
</xs:annotation>
<xs:sequence>
- <xs:element name="description" minOccurs="0" maxOccurs="1">
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
A description of this collection of graphics.
From 7f73c1d88a4406d183df64be4a9967c257bdf0e1 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 6 Mar 2025 10:10:18 +0100
Subject: [PATCH 41/42] tests: revisit examples
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
...nt-versionRange-non-external-explicit.xml} | 0
...nt-versionRange-non-external-implicit.xml} | 0
...component-external-version-and-range.json} | 0
...-component-external-version-and-range.xml} | 0
...t-versionRange-non-external-explicit.json} | 0
...t-versionRange-non-external-implicit.json} | 0
...valid-component-external-with-version.json | 35 +++++++++++++++++++
...-component-external-with-version.textproto | 30 ++++++++++++++++
.../valid-component-external-with-version.xml | 25 +++++++++++++
...-component-external-with-versionRange.json | 35 +++++++++++++++++++
...onent-external-with-versionRange.textproto | 30 ++++++++++++++++
...d-component-external-with-versionRange.xml | 25 +++++++++++++
...id-component-external-without-version.json | 34 ++++++++++++++++++
...mponent-external-without-version.textproto | 29 +++++++++++++++
...lid-component-external-without-version.xml | 24 +++++++++++++
...ent-extraneous-no-version-information.json | 15 --------
...nent-extraneous-no-version-information.xml | 11 ------
...lid-component-extraneous-with-version.json | 16 ---------
...omponent-extraneous-with-version.textproto | 13 -------
...alid-component-extraneous-with-version.xml | 12 -------
...omponent-extraneous-with-versionRange.json | 16 ---------
...ent-extraneous-with-versionRange.textproto | 13 -------
...component-extraneous-with-versionRange.xml | 12 -------
...-component-extraneous-without-version.json | 15 --------
...onent-extraneous-without-version.textproto | 12 -------
...d-component-extraneous-without-version.xml | 11 ------
26 files changed, 267 insertions(+), 146 deletions(-)
rename tools/src/test/resources/1.7/{informal-invalid-component-versionRange-non-extraneous-explicit.xml => informal-invalid-component-versionRange-non-external-explicit.xml} (100%)
rename tools/src/test/resources/1.7/{informal-invalid-component-versionRange-non-extraneous-implicit.xml => informal-invalid-component-versionRange-non-external-implicit.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-component-version-and-range.json => invalid-component-external-version-and-range.json} (100%)
rename tools/src/test/resources/1.7/{invalid-component-version-and-range.xml => invalid-component-external-version-and-range.xml} (100%)
rename tools/src/test/resources/1.7/{invalid-component-versionRange-non-extraneous-explicit.json => invalid-component-versionRange-non-external-explicit.json} (100%)
rename tools/src/test/resources/1.7/{invalid-component-versionRange-non-extraneous-implicit.json => invalid-component-versionRange-non-external-implicit.json} (100%)
create mode 100644 tools/src/test/resources/1.7/valid-component-external-with-version.json
create mode 100644 tools/src/test/resources/1.7/valid-component-external-with-version.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-external-with-version.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-external-with-versionRange.json
create mode 100644 tools/src/test/resources/1.7/valid-component-external-with-versionRange.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-external-with-versionRange.xml
create mode 100644 tools/src/test/resources/1.7/valid-component-external-without-version.json
create mode 100644 tools/src/test/resources/1.7/valid-component-external-without-version.textproto
create mode 100644 tools/src/test/resources/1.7/valid-component-external-without-version.xml
delete mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
delete mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml
delete mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
delete mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto
delete mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml
delete mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
delete mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
delete mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
delete mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-without-version.json
delete mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto
delete mode 100644 tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml
diff --git a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-external-explicit.xml
similarity index 100%
rename from tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml
rename to tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-external-explicit.xml
diff --git a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-external-implicit.xml
similarity index 100%
rename from tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml
rename to tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-external-implicit.xml
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.json b/tools/src/test/resources/1.7/invalid-component-external-version-and-range.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-component-version-and-range.json
rename to tools/src/test/resources/1.7/invalid-component-external-version-and-range.json
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.xml b/tools/src/test/resources/1.7/invalid-component-external-version-and-range.xml
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-component-version-and-range.xml
rename to tools/src/test/resources/1.7/invalid-component-external-version-and-range.xml
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-external-explicit.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
rename to tools/src/test/resources/1.7/invalid-component-versionRange-non-external-explicit.json
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-external-implicit.json
similarity index 100%
rename from tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
rename to tools/src/test/resources/1.7/invalid-component-versionRange-non-external-implicit.json
diff --git a/tools/src/test/resources/1.7/valid-component-external-with-version.json b/tools/src/test/resources/1.7/valid-component-external-with-version.json
new file mode 100644
index 00000000..82604759
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-external-with-version.json
@@ -0,0 +1,35 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.7",
+ "serialNumber": "urn:uuid:7dc07ac8-7fb8-4782-bf89-4762394e189d",
+ "version": 1,
+ "metadata": {
+ "component": {
+ "bom-ref": "my-app",
+ "type": "application",
+ "name": "My Application"
+ }
+ },
+ "components": [
+ {
+ "bom-ref": "os",
+ "type": "operating-system",
+ "name": "Ubuntu",
+ "version": "24.04",
+ "description": "Ubuntu 24.04",
+ "isExternal": true
+ }
+ ],
+ "dependencies": [
+ {
+ "ref": "my-app",
+ "dependsOn": [
+ "os"
+ ]
+ },
+ {
+ "ref": "os"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-external-with-version.textproto b/tools/src/test/resources/1.7/valid-component-external-with-version.textproto
new file mode 100644
index 00000000..7ff68ce8
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-external-with-version.textproto
@@ -0,0 +1,30 @@
+# proto-file: schema/bom-1.7.proto
+# proto-message: Bom
+
+spec_version: "1.7"
+version: 1
+serial_number: "urn:uuid:7dc07ac8-7fb8-4782-bf89-4762394e189d"
+metadata {
+ component {
+ bom_ref: "my-app"
+ type: CLASSIFICATION_APPLICATION
+ name: "My Application"
+ }
+}
+components {
+ bom_ref: "os"
+ type: CLASSIFICATION_OPERATING_SYSTEM
+ name: "Ubuntu"
+ version: "24.04"
+ description: "Ubuntu 24.04"
+ isExternal: true
+}
+dependencies {
+ ref: "my-app"
+ dependencies {
+ ref: "os"
+ }
+}
+dependencies {
+ ref: "os"
+}
diff --git a/tools/src/test/resources/1.7/valid-component-external-with-version.xml b/tools/src/test/resources/1.7/valid-component-external-with-version.xml
new file mode 100644
index 00000000..97d61c84
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-external-with-version.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+ serialNumber="urn:uuid:7dc07ac8-7fb8-4782-bf89-4762394e189d" version="1"
+>
+ <metadata>
+ <component bom-ref="my-app"
+ type="application">
+ <name>My Application</name>
+ </component>
+ </metadata>
+ <components>
+ <component bom-ref="os"
+ type="operating-system" isExternal="true">
+ <name>Ubuntu</name>
+ <version>24H2</version>
+ <description>Windows 11 version 21H2</description>
+ </component>
+ </components>
+ <dependencies>
+ <dependency ref="my-app">
+ <dependency ref="os"/>
+ </dependency>
+ <dependency ref="os"/>
+ </dependencies>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-external-with-versionRange.json b/tools/src/test/resources/1.7/valid-component-external-with-versionRange.json
new file mode 100644
index 00000000..183b2606
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-external-with-versionRange.json
@@ -0,0 +1,35 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.7",
+ "serialNumber": "urn:uuid:bdd25550-f1c1-4cb4-b406-0c8d05ad6382",
+ "version": 1,
+ "metadata": {
+ "component": {
+ "bom-ref": "my-app",
+ "type": "application",
+ "name": "My Application"
+ }
+ },
+ "components": [
+ {
+ "bom-ref": "libcurl",
+ "type": "library",
+ "name": "libcurl",
+ "versionRange": "vers:generic/>=8.7.1|<9.0.0",
+ "description": "libcurl ^8.7.1",
+ "isExternal": true
+ }
+ ],
+ "dependencies": [
+ {
+ "ref": "my-app",
+ "dependsOn": [
+ "libcurl"
+ ]
+ },
+ {
+ "ref": "libcurl"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-external-with-versionRange.textproto b/tools/src/test/resources/1.7/valid-component-external-with-versionRange.textproto
new file mode 100644
index 00000000..fc07c684
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-external-with-versionRange.textproto
@@ -0,0 +1,30 @@
+# proto-file: schema/bom-1.7.proto
+# proto-message: Bom
+
+spec_version: "1.7"
+version: 1
+serial_number: "urn:uuid:bdd25550-f1c1-4cb4-b406-0c8d05ad6382"
+metadata {
+ component {
+ bom_ref: "my-app"
+ type: CLASSIFICATION_APPLICATION
+ name: "My Application"
+ }
+}
+components {
+ bom_ref: "libcurl"
+ type: CLASSIFICATION_LIBRARY
+ name: "libcurl"
+ versionRange: "vers:generic/>=8.7.1|<9.0.0"
+ description: "libcurl ^8.7.1"
+ isExternal: true
+}
+dependencies {
+ ref: "my-app"
+ dependencies {
+ ref: "libcurl"
+ }
+}
+dependencies {
+ ref: "libcurl"
+}
diff --git a/tools/src/test/resources/1.7/valid-component-external-with-versionRange.xml b/tools/src/test/resources/1.7/valid-component-external-with-versionRange.xml
new file mode 100644
index 00000000..02557848
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-external-with-versionRange.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+ serialNumber="urn:uuid:bdd25550-f1c1-4cb4-b406-0c8d05ad6382" version="1"
+>
+ <metadata>
+ <component bom-ref="my-app"
+ type="application">
+ <name>My Application</name>
+ </component>
+ </metadata>
+ <components>
+ <component bom-ref="libcurl"
+ type="library" isExternal="true">
+ <name>libcurl</name>
+ <versionRange><![CDATA[vers:generic/>=8.7.1|<9.0.0]]></versionRange>
+ <description>libcurl ^8.7.1</description>
+ </component>
+ </components>
+ <dependencies>
+ <dependency ref="my-app">
+ <dependency ref="libcurl"/>
+ </dependency>
+ <dependency ref="libcurl"/>
+ </dependencies>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-external-without-version.json b/tools/src/test/resources/1.7/valid-component-external-without-version.json
new file mode 100644
index 00000000..4933e6fb
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-external-without-version.json
@@ -0,0 +1,34 @@
+{
+ "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
+ "bomFormat": "CycloneDX",
+ "specVersion": "1.7",
+ "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+ "version": 1,
+ "metadata": {
+ "component": {
+ "bom-ref": "my-app",
+ "type": "application",
+ "name": "My Application"
+ }
+ },
+ "components": [
+ {
+ "bom-ref": "os",
+ "type": "operating-system",
+ "name": "Windows 11 (64bit)",
+ "description": "any Windows 11",
+ "isExternal": true
+ }
+ ],
+ "dependencies": [
+ {
+ "ref": "my-app",
+ "dependsOn": [
+ "os"
+ ]
+ },
+ {
+ "ref": "os"
+ }
+ ]
+}
diff --git a/tools/src/test/resources/1.7/valid-component-external-without-version.textproto b/tools/src/test/resources/1.7/valid-component-external-without-version.textproto
new file mode 100644
index 00000000..abfa45ec
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-external-without-version.textproto
@@ -0,0 +1,29 @@
+# proto-file: schema/bom-1.7.proto
+# proto-message: Bom
+
+spec_version: "1.7"
+version: 1
+serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
+metadata {
+ component {
+ bom_ref: "my-app"
+ type: CLASSIFICATION_APPLICATION
+ name: "My Application"
+ }
+}
+components {
+ bom_ref: "os"
+ type: CLASSIFICATION_OPERATING_SYSTEM
+ name: "Windows 11 (64bit)"
+ description: "any Windows 11"
+ isExternal: true
+}
+dependencies {
+ ref: "my-app"
+ dependencies {
+ ref: "os"
+ }
+}
+dependencies {
+ ref: "os"
+}
diff --git a/tools/src/test/resources/1.7/valid-component-external-without-version.xml b/tools/src/test/resources/1.7/valid-component-external-without-version.xml
new file mode 100644
index 00000000..994cad06
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-component-external-without-version.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+ serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
+>
+ <metadata>
+ <component bom-ref="my-app"
+ type="application">
+ <name>My Application</name>
+ </component>
+ </metadata>
+ <components>
+ <component bom-ref="os"
+ type="operating-system" isExternal="true">
+ <name>Windows 11 (64bit)</name>
+ <description>any Windows 11</description>
+ </component>
+ </components>
+ <dependencies>
+ <dependency ref="my-app">
+ <dependency ref="os"/>
+ </dependency>
+ <dependency ref="os"/>
+ </dependencies>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
deleted file mode 100644
index 8fb7df7e..00000000
--- a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
- "bomFormat": "CycloneDX",
- "specVersion": "1.7",
- "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
- "version": 1,
- "components": [
- {
- "type": "library",
- "name": "Foo",
- "description": "extraneous without any version constraints",
- "isExternal": true
- }
- ]
-}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml
deleted file mode 100644
index dbcfb122..00000000
--- a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
- serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
->
- <components>
- <component type="library" isExternal="true">
- <name>Foo</name>
- <description>extraneous without any version constraints</description>
- </component>
- </components>
-</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
deleted file mode 100644
index e5375cdd..00000000
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
- "bomFormat": "CycloneDX",
- "specVersion": "1.7",
- "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
- "version": 1,
- "components": [
- {
- "type": "library",
- "name": "Foo",
- "description": "extraneous with version constraint",
- "isExternal": true,
- "version": "9.1.24"
- }
- ]
-}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto
deleted file mode 100644
index 6c46e877..00000000
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-# proto-file: schema/bom-1.7.proto
-# proto-message: Bom
-
-spec_version: "1.7"
-version: 1
-serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
-components {
- type: CLASSIFICATION_LIBRARY
- name: "Foo"
- description: "extraneous with version constraint",
- isExternal: true
- version: "9.1.24"
-}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml
deleted file mode 100644
index cef8d8d1..00000000
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
- serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
->
- <components>
- <component type="library" isExternal="true">
- <name>Foo</name>
- <version>9.1.24</version>
- <description>extraneous with version constraint</description>
- </component>
- </components>
-</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
deleted file mode 100644
index 7ea7f295..00000000
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
- "bomFormat": "CycloneDX",
- "specVersion": "1.7",
- "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
- "version": 1,
- "components": [
- {
- "type": "library",
- "name": "Foo",
- "description": "extraneous with version range constraints",
- "isExternal": true,
- "versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
- }
- ]
-}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
deleted file mode 100644
index a6f39d32..00000000
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-# proto-file: schema/bom-1.7.proto
-# proto-message: Bom
-
-spec_version: "1.7"
-version: 1
-serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
-components {
- type: CLASSIFICATION_LIBRARY
- name: "Foo"
- description: "extraneous with version range constraints"
- isExternal: true
- versionRange: "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
-}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
deleted file mode 100644
index a63ee165..00000000
--- a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
- serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
->
- <components>
- <component type="library" isExternal="true">
- <name>Foo</name>
- <versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
- <description>extraneous with version range constraints</description>
- </component>
- </components>
-</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json
deleted file mode 100644
index dcf80b10..00000000
--- a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
- "bomFormat": "CycloneDX",
- "specVersion": "1.7",
- "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
- "version": 1,
- "components": [
- {
- "type": "library",
- "name": "Foo",
- "description": "extraneous without version constraint",
- "isExternal": true
- }
- ]
-}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto
deleted file mode 100644
index 36e4955c..00000000
--- a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-# proto-file: schema/bom-1.7.proto
-# proto-message: Bom
-
-spec_version: "1.7"
-version: 1
-serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
-components {
- type: CLASSIFICATION_LIBRARY
- name: "Foo"
- description: "extraneous without version constraint",
- isExternal: true
-}
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml
deleted file mode 100644
index 6115869c..00000000
--- a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
- serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
->
- <components>
- <component type="library" isExternal="true">
- <name>Foo</name>
- <description>extraneous without version constraint</description>
- </component>
- </components>
-</bom>
From ebe66bc58a776411022661404419aba118631034 Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Thu, 6 Mar 2025 10:12:57 +0100
Subject: [PATCH 42/42] dev-docs
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
schema/bom-1.7.xsd | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 1b531d57..c17c1ff3 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -784,7 +784,8 @@ limitations under the License.
</xs:anyAttribute>
<!-- Attention:
This would be formal, if the support for XSD1.1's `assert` was properly implemented in validators and tools digesting XML.
- <xs:assert id="versionRange_requires_isExternal_eq_true"
+ <xs:assert vc:minVersion="1.1"
+ id="versionRange_requires_isExternal_eq_true"
test="if (versionRange) then (@isExternal eq 'true') else true()">
Child `versionRange` May only be present, if attribute `isExternal`=='true'.
</xs:assert>