diff --git a/capycli/bom/bom_validate.py b/capycli/bom/bom_validate.py index 2b7b6b3..831f1ff 100644 --- a/capycli/bom/bom_validate.py +++ b/capycli/bom/bom_validate.py @@ -55,7 +55,7 @@ def display_help(self) -> None: print("optional arguments:") print(" -h, --help Show this help message and exit") print(" -i INPUTFILE Input BOM filename (JSON)") - print(" -version SpecVersion CycloneDX spec version to validate against: allowed are 1.4, 1.5, and 1.6") + print(" -version SpecVersion CycloneDX spec version to validate against: allowed are 1.4 ... 1.7") print(" -v be verbose (show more details about purl, download URL, and license)") print(" --forceerror force an error exit code in case of validation errors or warnings") diff --git a/capycli/common/capycli_bom_support.py b/capycli/common/capycli_bom_support.py index bdb659f..289bac4 100644 --- a/capycli/common/capycli_bom_support.py +++ b/capycli/common/capycli_bom_support.py @@ -21,7 +21,7 @@ from cyclonedx.model.definition import Definitions, Standard from cyclonedx.model.tool import ToolRepository from cyclonedx.output import make_outputter -from cyclonedx.output.json import JsonV1Dot6 +from cyclonedx.output.json import JsonV1Dot6, JsonV1Dot7 from cyclonedx.schema import OutputFormat, SchemaVersion from cyclonedx.validation.json import JsonStrictValidator @@ -564,6 +564,8 @@ def write_simple_sbom(cls, bom: SortedSet, outputfile: str) -> None: @classmethod def _string_to_schema_version(cls, spec_version: str) -> SchemaVersion: """Convert the given string to a CycloneDX spec version.""" + if spec_version == "1.7": + return SchemaVersion.V1_7 if spec_version == "1.6": return SchemaVersion.V1_6 if spec_version == "1.5":