Skip to content

Draft: prepare for CycloneDX 1.7 support #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gernot-h wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Draft

Draft: prepare for CycloneDX 1.7 support #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion capycli/bom/bom_validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
4 changes: 3 additions & 1 deletion capycli/common/capycli_bom_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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":
Expand Down
Loading