|
24 | 24 | from cyclonedx.model import OrganizationalEntity, XsUri
|
25 | 25 | from cyclonedx.model.bom import Bom
|
26 | 26 | from cyclonedx.model.component import Component, ComponentType
|
27 |
| -from cyclonedx.output import make_outputter, LATEST_SUPPORTED_SCHEMA_VERSION |
28 |
| -from cyclonedx.output.json import JsonV1Dot4 |
| 27 | +from cyclonedx.output import make_outputter |
| 28 | +from cyclonedx.output.json import JsonV1Dot5 |
29 | 29 | from cyclonedx.schema import SchemaVersion, OutputFormat
|
30 | 30 | from cyclonedx.validation.json import JsonStrictValidator
|
31 | 31 | from cyclonedx.validation import make_schemabased_validator
|
|
79 | 79 | # region JSON
|
80 | 80 | """demo with explicit instructions for SchemaVersion, outputter and validator"""
|
81 | 81 |
|
82 |
| -my_json_outputter: 'JsonOutputter' = JsonV1Dot4(bom) |
| 82 | +my_json_outputter: 'JsonOutputter' = JsonV1Dot5(bom) |
83 | 83 | serialized_json = my_json_outputter.output_as_string(indent=2)
|
84 | 84 | print(serialized_json)
|
85 |
| -my_json_validator = JsonStrictValidator(SchemaVersion.V1_4) |
| 85 | +my_json_validator = JsonStrictValidator(SchemaVersion.V1_5) |
86 | 86 | try:
|
87 | 87 | validation_errors = my_json_validator.validate_str(serialized_json)
|
88 | 88 | if validation_errors:
|
|
99 | 99 | # region XML
|
100 | 100 | """demo with implicit instructions for SchemaVersion, outputter and validator. TypeCheckers will catch errors."""
|
101 | 101 |
|
102 |
| -my_xml_outputter: 'XmlOutputter' = make_outputter(bom, OutputFormat.XML, LATEST_SUPPORTED_SCHEMA_VERSION) |
| 102 | +my_xml_outputter: 'XmlOutputter' = make_outputter(bom, OutputFormat.XML, SchemaVersion.V1_5) |
103 | 103 | serialized_xml = my_xml_outputter.output_as_string(indent=2)
|
104 | 104 | print(serialized_xml)
|
105 | 105 | my_xml_validator: 'XmlValidator' = make_schemabased_validator(
|
|
0 commit comments