diff options
| author | Brandon Lum <lumjjb@gmail.com> | 2023-05-18 09:29:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-18 09:29:08 -0400 |
| commit | 944e8cbc0ed352a536635393d5da5be2da044e07 (patch) | |
| tree | c75421e099e6e734611e1203ca779a102cef19e9 | |
| parent | 564d598c05824d66f071057614699dee2a427c1e (diff) | |
| parent | a857218af5e2c059af935cd303c30b5576e25f5c (diff) | |
| download | spdx-tools-944e8cbc0ed352a536635393d5da5be2da044e07.tar.gz | |
Merge pull request #215 from spdx/optional-params
Fixing some optional params: copyrightText, licenseListVersion, packageVerificationCode
| -rw-r--r-- | spdx/v2/v2_1/creation_info.go | 2 | ||||
| -rw-r--r-- | spdx/v2/v2_1/package.go | 2 | ||||
| -rw-r--r-- | spdx/v2/v2_2/creation_info.go | 2 | ||||
| -rw-r--r-- | spdx/v2/v2_2/package.go | 2 | ||||
| -rw-r--r-- | spdx/v2/v2_3/creation_info.go | 2 | ||||
| -rw-r--r-- | spdx/v2/v2_3/package.go | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/spdx/v2/v2_1/creation_info.go b/spdx/v2/v2_1/creation_info.go index 8b6ca18..c75e8ea 100644 --- a/spdx/v2/v2_1/creation_info.go +++ b/spdx/v2/v2_1/creation_info.go @@ -11,7 +11,7 @@ import ( type CreationInfo struct { // 2.7: License List Version // Cardinality: optional, one - LicenseListVersion string `json:"licenseListVersion"` + LicenseListVersion string `json:"licenseListVersion,omitempty"` // 2.8: Creators: may have multiple keys for Person, Organization // and/or Tool diff --git a/spdx/v2/v2_1/package.go b/spdx/v2/v2_1/package.go index 85a4c4b..9800c2c 100644 --- a/spdx/v2/v2_1/package.go +++ b/spdx/v2/v2_1/package.go @@ -45,7 +45,7 @@ type Package struct { IsFilesAnalyzedTagPresent bool `json:"-"` // 3.9: Package Verification Code - PackageVerificationCode common.PackageVerificationCode `json:"packageVerificationCode"` + PackageVerificationCode common.PackageVerificationCode `json:"packageVerificationCode,omitempty"` // 3.10: Package Checksum: may have keys for SHA1, SHA256 and/or MD5 // Cardinality: optional, one or many diff --git a/spdx/v2/v2_2/creation_info.go b/spdx/v2/v2_2/creation_info.go index 8496462..39082e7 100644 --- a/spdx/v2/v2_2/creation_info.go +++ b/spdx/v2/v2_2/creation_info.go @@ -11,7 +11,7 @@ import ( type CreationInfo struct { // 6.7: License List Version // Cardinality: optional, one - LicenseListVersion string `json:"licenseListVersion"` + LicenseListVersion string `json:"licenseListVersion,omitempty"` // 6.8: Creators: may have multiple keys for Person, Organization // and/or Tool diff --git a/spdx/v2/v2_2/package.go b/spdx/v2/v2_2/package.go index aaaeabd..d9f6bad 100644 --- a/spdx/v2/v2_2/package.go +++ b/spdx/v2/v2_2/package.go @@ -53,7 +53,7 @@ type Package struct { IsFilesAnalyzedTagPresent bool `json:"-"` // 7.9: Package Verification Code - PackageVerificationCode common.PackageVerificationCode `json:"packageVerificationCode"` + PackageVerificationCode common.PackageVerificationCode `json:"packageVerificationCode,omitempty"` // 7.10: Package Checksum: may have keys for SHA1, SHA256, SHA512 and/or MD5 // Cardinality: optional, one or many diff --git a/spdx/v2/v2_3/creation_info.go b/spdx/v2/v2_3/creation_info.go index 90ee403..84d5bf0 100644 --- a/spdx/v2/v2_3/creation_info.go +++ b/spdx/v2/v2_3/creation_info.go @@ -10,7 +10,7 @@ import ( type CreationInfo struct { // 6.7: License List Version // Cardinality: optional, one - LicenseListVersion string `json:"licenseListVersion"` + LicenseListVersion string `json:"licenseListVersion,omitempty"` // 6.8: Creators: may have multiple keys for Person, Organization // and/or Tool diff --git a/spdx/v2/v2_3/package.go b/spdx/v2/v2_3/package.go index 88edf0d..b191d7b 100644 --- a/spdx/v2/v2_3/package.go +++ b/spdx/v2/v2_3/package.go @@ -86,8 +86,8 @@ type Package struct { PackageLicenseComments string `json:"licenseComments,omitempty"` // 7.17: Copyright Text: copyright notice(s) text, "NONE" or "NOASSERTION" - // Cardinality: mandatory, one - PackageCopyrightText string `json:"copyrightText"` + // Cardinality: optional, zero or one + PackageCopyrightText string `json:"copyrightText,omitempty"` // 7.18: Package Summary Description // Cardinality: optional, one |