Mirrors/grype
2
0
Fork 0
mirror of https://github.com/anchore/grype synced 2024-11-10 06:34:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a cyclonedxvex typo and fix the schema document from (#830)

Browse source 
https://github.com/CycloneDX/specification/issues/147

Signed-off-by: Josh Bressers <josh@bress.net>
This commit is contained in:
Josh Bressers 2022-07-17 10:34:41 -05:00 committed by GitHub
parent 51617f8aa5
commit 8ce541ee1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
schema/cyclonedxvex/Makefile
View file

@ -5,10 +5,10 @@ validate-schema: validate-schema-xml validate-schema-json
.PHONY: validate-schema-xml
validate-schema-xml:
go run ../../main.go -c ../../test/grype-test-config.yaml ubuntu:latest -vv -o embedded-cyclondex-vex-xml > bom.xml
go run ../../main.go -c ../../test/grype-test-config.yaml ubuntu:latest -vv -o embedded-cyclonedx-vex-xml > bom.xml
xmllint --noout --schema ./cyclonedx.xsd bom.xml
.PHONY: validate-schema-json
validate-schema-json:
go run ../../main.go -c ../../test/grype-test-config.yaml ubuntu:latest -vv -o embedded-cyclondex-vex-json > bom.json
go run ../../main.go -c ../../test/grype-test-config.yaml ubuntu:latest -vv -o embedded-cyclonedx-vex-json > bom.json
../../.tmp/yajsv -s cyclonedx.json bom.json

10
schema/cyclonedxvex/cyclonedx.xsd
View file

@ -2014,6 +2014,16 @@ limitations under the License.
</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 key/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>