Skip to content

Commit

Permalink
update cyclonedx-go: v0.3.0 -> v0.4.0
Browse files Browse the repository at this point in the history
Signed-off-by: nscuro <[email protected]>
  • Loading branch information
nscuro committed Jul 31, 2021
1 parent 27eb9c8 commit 5bab19b
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/CycloneDX/cyclonedx-gomod
go 1.16

require (
github.com/CycloneDX/cyclonedx-go v0.3.0
github.com/CycloneDX/cyclonedx-go v0.4.0
github.com/bradleyjkemp/cupaloy/v2 v2.6.0
github.com/go-enry/go-license-detector/v4 v4.3.0
github.com/go-git/go-git/v5 v5.4.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/CycloneDX/cyclonedx-go v0.3.0 h1:goWTclFD33vnHduCOwbAQcHDYoCnTRYF1Zm11Pb1YoM=
github.com/CycloneDX/cyclonedx-go v0.3.0/go.mod h1:rmRcf//gT7PIzovatusbWi377xqCg1FS4jyST0GH20E=
github.com/CycloneDX/cyclonedx-go v0.4.0 h1:Wz4QZ9B4RXGWIWTypVLEOVJgOdFfy5mcS5PGNzUkZxU=
github.com/CycloneDX/cyclonedx-go v0.4.0/go.mod h1:rmRcf//gT7PIzovatusbWi377xqCg1FS4jyST0GH20E=
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
Expand Down
4 changes: 2 additions & 2 deletions main_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ func extractFixture(t *testing.T, archivePath string) string {
}

func assertValidSBOM(t *testing.T, bomFilePath string) {
inputFormat := "xml_v1_2"
inputFormat := "xml_v1_3"
if strings.HasSuffix(bomFilePath, ".json") {
inputFormat = "json_v1_2"
inputFormat = "json_v1_3"
}
valCmd := exec.Command("cyclonedx", "validate", "--input-file", bomFilePath, "--input-format", inputFormat, "--fail-on-errors")
valOut, err := valCmd.CombinedOutput()
Expand Down
2 changes: 1 addition & 1 deletion testdata/integration/snapshots/TestIntegrationLocal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bom xmlns="http://cyclonedx.org/schema/bom/1.2" serialNumber="urn:uuid:00000000-0000-0000-0000-000000000000" version="1">
<bom xmlns="http://cyclonedx.org/schema/bom/1.3" serialNumber="urn:uuid:00000000-0000-0000-0000-000000000000" version="1">
<metadata>
<component bom-ref="pkg:golang/[email protected]" type="library">
<name>testmod-local</name>
Expand Down
2 changes: 1 addition & 1 deletion testdata/integration/snapshots/TestIntegrationNested
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bom xmlns="http://cyclonedx.org/schema/bom/1.2" serialNumber="urn:uuid:00000000-0000-0000-0000-000000000000" version="1">
<bom xmlns="http://cyclonedx.org/schema/bom/1.3" serialNumber="urn:uuid:00000000-0000-0000-0000-000000000000" version="1">
<metadata>
<component bom-ref="pkg:golang/[email protected]" type="library">
<name>testmod-simple</name>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bom xmlns="http://cyclonedx.org/schema/bom/1.2" serialNumber="urn:uuid:00000000-0000-0000-0000-000000000000" version="1">
<bom xmlns="http://cyclonedx.org/schema/bom/1.3" serialNumber="urn:uuid:00000000-0000-0000-0000-000000000000" version="1">
<metadata>
<component bom-ref="pkg:golang/[email protected]" type="library">
<name>testmod-nodeps</name>
Expand Down
2 changes: 1 addition & 1 deletion testdata/integration/snapshots/TestIntegrationSimple
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bom xmlns="http://cyclonedx.org/schema/bom/1.2" serialNumber="urn:uuid:00000000-0000-0000-0000-000000000000" version="1">
<bom xmlns="http://cyclonedx.org/schema/bom/1.3" serialNumber="urn:uuid:00000000-0000-0000-0000-000000000000" version="1">
<metadata>
<component bom-ref="pkg:golang/[email protected]" type="library">
<name>testmod-simple</name>
Expand Down
2 changes: 1 addition & 1 deletion testdata/integration/snapshots/TestIntegrationVendored
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bom xmlns="http://cyclonedx.org/schema/bom/1.2" serialNumber="urn:uuid:00000000-0000-0000-0000-000000000000" version="1">
<bom xmlns="http://cyclonedx.org/schema/bom/1.3" serialNumber="urn:uuid:00000000-0000-0000-0000-000000000000" version="1">
<metadata>
<component bom-ref="pkg:golang/[email protected]" type="library">
<name>testmod-vendored</name>
Expand Down

0 comments on commit 5bab19b

Please sign in to comment.