diff --git a/convert.go b/convert.go index 6acec2f..f3bbb68 100644 --- a/convert.go +++ b/convert.go @@ -145,6 +145,11 @@ func componentConverter(specVersion SpecVersion) func(*Component) { } } + if specVersion < SpecVersion1_6 { + c.SWHID = nil + c.OmniborID = nil + } + if !specVersion.supportsComponentType(c.Type) { c.Type = ComponentTypeApplication } diff --git a/cyclonedx.go b/cyclonedx.go index 9afabe0..c223e93 100644 --- a/cyclonedx.go +++ b/cyclonedx.go @@ -95,10 +95,10 @@ type BOM struct { func NewBOM() *BOM { return &BOM{ - JSONSchema: jsonSchemas[SpecVersion1_5], - XMLNS: xmlNamespaces[SpecVersion1_5], + JSONSchema: jsonSchemas[SpecVersion1_6], + XMLNS: xmlNamespaces[SpecVersion1_6], BOMFormat: BOMFormat, - SpecVersion: SpecVersion1_5, + SpecVersion: SpecVersion1_6, Version: 1, } } @@ -173,6 +173,8 @@ type Component struct { Copyright string `json:"copyright,omitempty" xml:"copyright,omitempty"` CPE string `json:"cpe,omitempty" xml:"cpe,omitempty"` PackageURL string `json:"purl,omitempty" xml:"purl,omitempty"` + OmniborID *[]string `json:"omniborId,omitempty" xml:"omniborId,omitempty"` + SWHID *[]string `json:"swhid,omitempty" xml:"swhid,omitempty"` SWID *SWID `json:"swid,omitempty" xml:"swid,omitempty"` Modified *bool `json:"modified,omitempty" xml:"modified,omitempty"` Pedigree *Pedigree `json:"pedigree,omitempty" xml:"pedigree,omitempty"` @@ -325,13 +327,15 @@ type EvidenceIdentity struct { type EvidenceIdentityFieldType string const ( - EvidenceIdentityFieldTypeCPE EvidenceIdentityFieldType = "cpe" - EvidenceIdentityFieldTypeGroup EvidenceIdentityFieldType = "group" - EvidenceIdentityFieldTypeHash EvidenceIdentityFieldType = "hash" - EvidenceIdentityFieldTypeName EvidenceIdentityFieldType = "name" - EvidenceIdentityFieldTypePURL EvidenceIdentityFieldType = "purl" - EvidenceIdentityFieldTypeSWID EvidenceIdentityFieldType = "swid" - EvidenceIdentityFieldTypeVersion EvidenceIdentityFieldType = "version" + EvidenceIdentityFieldTypeCPE EvidenceIdentityFieldType = "cpe" + EvidenceIdentityFieldTypeGroup EvidenceIdentityFieldType = "group" + EvidenceIdentityFieldTypeHash EvidenceIdentityFieldType = "hash" + EvidenceIdentityFieldTypeName EvidenceIdentityFieldType = "name" + EvidenceIdentityFieldTypePURL EvidenceIdentityFieldType = "purl" + EvidenceIdentityFieldTypeOmniborID EvidenceIdentityFieldType = "omniborId" + EvidenceIdentityFieldTypeSWHID EvidenceIdentityFieldType = "swhid" + EvidenceIdentityFieldTypeSWID EvidenceIdentityFieldType = "swid" + EvidenceIdentityFieldTypeVersion EvidenceIdentityFieldType = "version" ) type EvidenceIdentityMethod struct { diff --git a/cyclonedx_json.go b/cyclonedx_json.go index 1530510..8faa679 100644 --- a/cyclonedx_json.go +++ b/cyclonedx_json.go @@ -124,6 +124,8 @@ func (sv *SpecVersion) UnmarshalJSON(bytes []byte) error { *sv = SpecVersion1_4 case SpecVersion1_5.String(): *sv = SpecVersion1_5 + case SpecVersion1_6.String(): + *sv = SpecVersion1_6 default: return ErrInvalidSpecVersion } @@ -192,4 +194,5 @@ var jsonSchemas = map[SpecVersion]string{ SpecVersion1_3: "http://cyclonedx.org/schema/bom-1.3.schema.json", SpecVersion1_4: "http://cyclonedx.org/schema/bom-1.4.schema.json", SpecVersion1_5: "http://cyclonedx.org/schema/bom-1.5.schema.json", + SpecVersion1_6: "http://cyclonedx.org/schema/bom-1.6.schema.json", } diff --git a/cyclonedx_xml.go b/cyclonedx_xml.go index 32eb80c..5624879 100644 --- a/cyclonedx_xml.go +++ b/cyclonedx_xml.go @@ -292,6 +292,8 @@ func (sv *SpecVersion) UnmarshalXML(d *xml.Decoder, start xml.StartElement) erro *sv = SpecVersion1_4 case SpecVersion1_5.String(): *sv = SpecVersion1_5 + case SpecVersion1_6.String(): + *sv = SpecVersion1_6 default: return ErrInvalidSpecVersion } @@ -411,4 +413,5 @@ var xmlNamespaces = map[SpecVersion]string{ SpecVersion1_3: "http://cyclonedx.org/schema/bom/1.3", SpecVersion1_4: "http://cyclonedx.org/schema/bom/1.4", SpecVersion1_5: "http://cyclonedx.org/schema/bom/1.5", + SpecVersion1_6: "http://cyclonedx.org/schema/bom/1.6", } diff --git a/encode_test.go b/encode_test.go index d099f15..c65bd29 100644 --- a/encode_test.go +++ b/encode_test.go @@ -50,9 +50,9 @@ func TestJsonBOMEncoder_SetPretty(t *testing.T) { require.NoError(t, encoder.Encode(bom)) assert.Equal(t, `{ - "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", + "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "version": 1, "metadata": { "authors": [ @@ -83,9 +83,9 @@ func TestJsonBOMEncoder_SetEscapeHTML_true(t *testing.T) { require.NoError(t, encoder.Encode(bom)) assert.Equal(t, `{ - "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", + "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "version": 1, "metadata": { "authors": [ @@ -116,9 +116,9 @@ func TestJsonBOMEncoder_SetEscapeHTML_false(t *testing.T) { require.NoError(t, encoder.Encode(bom)) assert.Equal(t, `{ - "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", + "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "version": 1, "metadata": { "authors": [ @@ -158,7 +158,7 @@ func TestXmlBOMEncoder_SetPretty(t *testing.T) { require.NoError(t, encoder.Encode(bom)) assert.Equal(t, ` - + @@ -186,7 +186,7 @@ func TestJsonBOMEncoder_EncodeVersion(t *testing.T) { require.ErrorContains(t, err, "not supported") }) - for _, version := range []SpecVersion{SpecVersion1_2, SpecVersion1_3, SpecVersion1_4, SpecVersion1_5} { + for _, version := range []SpecVersion{SpecVersion1_2, SpecVersion1_3, SpecVersion1_4, SpecVersion1_5, SpecVersion1_6} { t.Run(version.String(), func(t *testing.T) { // Read original BOM JSON inputFile, err := os.Open("./testdata/valid-bom.json") @@ -216,7 +216,7 @@ func TestJsonBOMEncoder_EncodeVersion(t *testing.T) { } func TestXmlBOMEncoder_EncodeVersion(t *testing.T) { - for _, version := range []SpecVersion{SpecVersion1_0, SpecVersion1_1, SpecVersion1_2, SpecVersion1_3, SpecVersion1_4, SpecVersion1_5} { + for _, version := range []SpecVersion{SpecVersion1_0, SpecVersion1_1, SpecVersion1_2, SpecVersion1_3, SpecVersion1_4, SpecVersion1_5, SpecVersion1_6} { t.Run(version.String(), func(t *testing.T) { // Read original BOM JSON inputFile, err := os.Open("./testdata/valid-bom.xml") diff --git a/example_test.go b/example_test.go index efe2dcd..e8f7d8b 100644 --- a/example_test.go +++ b/example_test.go @@ -89,7 +89,7 @@ func Example_encode() { // Output: // - // + // // // // ACME Application diff --git a/roundtrip_test.go b/roundtrip_test.go index 8fa9dc7..64c8e92 100644 --- a/roundtrip_test.go +++ b/roundtrip_test.go @@ -52,7 +52,7 @@ func TestRoundTripJSON(t *testing.T) { require.NoError(t, err) // Sanity checks: BOM has to be valid - assertValidBOM(t, buf.Bytes(), BOMFileFormatJSON, SpecVersion1_5) + assertValidBOM(t, buf.Bytes(), BOMFileFormatJSON, SpecVersion1_6) // Compare with snapshot assert.NoError(t, snapShooter.SnapshotMulti(filepath.Base(bomFilePath), buf.String())) @@ -85,7 +85,7 @@ func TestRoundTripXML(t *testing.T) { require.NoError(t, err) // Sanity check: BOM has to be valid - assertValidBOM(t, buf.Bytes(), BOMFileFormatXML, SpecVersion1_5) + assertValidBOM(t, buf.Bytes(), BOMFileFormatXML, SpecVersion1_6) // Compare with snapshot assert.NoError(t, snapShooter.SnapshotMulti(filepath.Base(bomFilePath), buf.String())) diff --git a/schema/bom-1.6.xsd b/schema/bom-1.6.xsd index 5119056..23dc620 100644 --- a/schema/bom-1.6.xsd +++ b/schema/bom-1.6.xsd @@ -24,7 +24,7 @@ limitations under the License. vc:maxVersion="1.1" version="1.6.0"> - + diff --git a/testdata/snapshots/cyclonedx-go-TestJsonBOMEncoder_EncodeVersion-func3-1.6.bom.json b/testdata/snapshots/cyclonedx-go-TestJsonBOMEncoder_EncodeVersion-func3-1.6.bom.json new file mode 100644 index 0000000..925418a --- /dev/null +++ b/testdata/snapshots/cyclonedx-go-TestJsonBOMEncoder_EncodeVersion-func3-1.6.bom.json @@ -0,0 +1,200 @@ +{ + "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", + "bomFormat": "CycloneDX", + "specVersion": "1.6", + "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", + "version": 1, + "metadata": { + "timestamp": "2020-04-13T20:20:39+00:00", + "tools": { + "components": [ + { + "type": "application", + "group": "Awesome Vendor", + "name": "Awesome Tool", + "version": "9.1.2", + "hashes": [ + { + "alg": "SHA-1", + "content": "25ed8e31b995bb927966616df2a42b979a2717f0" + }, + { + "alg": "SHA-256", + "content": "a74f733635a19aefb1f73e5947cef59cd7440c6952ef0f03d09d974274cbd6df" + } + ] + } + ], + "services": [ + { + "provider": { + "name": "Acme Org", + "url": [ + "https://example.com" + ] + }, + "group": "com.example", + "name": "Acme Signing Server", + "description": "Signs artifacts", + "endpoints": [ + "https://example.com/sign", + "https://example.com/verify", + "https://example.com/tsa" + ] + } + ] + }, + "authors": [ + { + "name": "Samantha Wright", + "email": "samantha.wright@example.com", + "phone": "800-555-1212" + } + ], + "component": { + "type": "application", + "author": "Acme Super Heros", + "name": "Acme Application", + "version": "9.1.1", + "swid": { + "text": { + "content": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxTb2Z0d2FyZUlkZW50aXR5IHhtbDpsYW5nPSJFTiIgbmFtZT0iQWNtZSBBcHBsaWNhdGlvbiIgdmVyc2lvbj0iOS4xLjEiIAogdmVyc2lvblNjaGVtZT0ibXVsdGlwYXJ0bnVtZXJpYyIgCiB0YWdJZD0ic3dpZGdlbi1iNTk1MWFjOS00MmMwLWYzODItM2YxZS1iYzdhMmE0NDk3Y2JfOS4xLjEiIAogeG1sbnM9Imh0dHA6Ly9zdGFuZGFyZHMuaXNvLm9yZy9pc28vMTk3NzAvLTIvMjAxNS9zY2hlbWEueHNkIj4gCiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiAKIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL3N0YW5kYXJkcy5pc28ub3JnL2lzby8xOTc3MC8tMi8yMDE1LWN1cnJlbnQvc2NoZW1hLnhzZCBzY2hlbWEueHNkIiA+CiAgPE1ldGEgZ2VuZXJhdG9yPSJTV0lEIFRhZyBPbmxpbmUgR2VuZXJhdG9yIHYwLjEiIC8+IAogIDxFbnRpdHkgbmFtZT0iQWNtZSwgSW5jLiIgcmVnaWQ9ImV4YW1wbGUuY29tIiByb2xlPSJ0YWdDcmVhdG9yIiAvPiAKPC9Tb2Z0d2FyZUlkZW50aXR5Pg==", + "contentType": "text/xml", + "encoding": "base64" + }, + "tagId": "swidgen-242eb18a-503e-ca37-393b-cf156ef09691_9.1.1", + "name": "Acme Application", + "version": "9.1.1" + } + }, + "manufacture": { + "name": "Acme, Inc.", + "url": [ + "https://example.com" + ], + "contact": [ + { + "name": "Acme Professional Services", + "email": "professional.services@example.com" + } + ] + }, + "supplier": { + "name": "Acme, Inc.", + "url": [ + "https://example.com" + ], + "contact": [ + { + "name": "Acme Distribution", + "email": "distribution@example.com" + } + ] + } + }, + "components": [ + { + "bom-ref": "pkg:npm/acme/component@1.0.0", + "type": "library", + "publisher": "Acme Inc", + "group": "com.acme", + "name": "tomcat-catalina", + "version": "9.0.14", + "hashes": [ + { + "alg": "MD5", + "content": "3942447fac867ae5cdb3229b658f4d48" + }, + { + "alg": "SHA-1", + "content": "e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a" + }, + { + "alg": "SHA-256", + "content": "f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b" + }, + { + "alg": "SHA-512", + "content": "e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282" + } + ], + "licenses": [ + { + "license": { + "id": "Apache-2.0", + "text": { + "content": "
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.", + "contentType": "text/plain", + "encoding": "base64" + }, + "url": "https://www.apache.org/licenses/LICENSE-2.0.txt" + } + } + ], + "purl": "pkg:npm/acme/component@1.0.0", + "pedigree": { + "ancestors": [ + { + "type": "library", + "publisher": "Acme Inc", + "group": "com.acme", + "name": "tomcat-catalina", + "version": "9.0.14" + }, + { + "type": "library", + "publisher": "Acme Inc", + "group": "com.acme", + "name": "tomcat-catalina", + "version": "9.0.14" + } + ], + "commits": [ + { + "uid": "7638417db6d59f3c431d3e1f261cc637155684cd", + "url": "https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd", + "author": { + "timestamp": "2018-11-13T20:20:39+00:00", + "name": "me", + "email": "me@acme.org" + } + } + ] + } + }, + { + "type": "library", + "supplier": { + "name": "Example, Inc.", + "url": [ + "https://example.com", + "https://example.net" + ], + "contact": [ + { + "name": "Example Support AMER Distribution", + "email": "support@example.com", + "phone": "800-555-1212" + }, + { + "name": "Example Support APAC", + "email": "support@apac.example.com" + } + ] + }, + "author": "Example Super Heros", + "group": "org.example", + "name": "mylibrary", + "version": "1.0.0" + } + ], + "dependencies": [ + { + "ref": "pkg:npm/acme/component@1.0.0", + "dependsOn": [ + "pkg:npm/acme/component@1.0.0" + ] + } + ] +} + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-annotation.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-annotation.json index 8c36da8..d7e7c85 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-annotation.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-annotation.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-assembly.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-assembly.json index 7824237..7e5a354 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-assembly.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-assembly.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-bom.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-bom.json index f233380..9a6ca6a 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-bom.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-bom.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-hashes.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-hashes.json index 527577e..472d825 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-hashes.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-hashes.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-omniborId.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-omniborId.json new file mode 100644 index 0000000..a59525c --- /dev/null +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-omniborId.json @@ -0,0 +1,18 @@ +{ + "bomFormat": "CycloneDX", + "specVersion": "1.6", + "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", + "version": 1, + "components": [ + { + "type": "application", + "author": "Acme Super Heros", + "name": "Acme Application", + "version": "9.1.1", + "omniborId": [ + "gitoid:blob:sha1:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3" + ] + } + ] +} + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-ref.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-ref.json index 99307aa..bc70bc6 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-ref.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-ref.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-swhid.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-swhid.json new file mode 100644 index 0000000..1125341 --- /dev/null +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-swhid.json @@ -0,0 +1,18 @@ +{ + "bomFormat": "CycloneDX", + "specVersion": "1.6", + "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", + "version": 1, + "components": [ + { + "type": "application", + "author": "Acme Super Heros", + "name": "Acme Application", + "version": "9.1.1", + "swhid": [ + "swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2" + ] + } + ] +} + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-swid-full.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-swid-full.json index 33b727a..11111a5 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-swid-full.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-swid-full.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-swid.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-swid.json index 37565aa..38c1927 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-swid.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-swid.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-types.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-types.json index 29abae2..48b8915 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-types.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-component-types.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-compositions.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-compositions.json index ca75376..6fe5957 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-compositions.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-compositions.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-dependency.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-dependency.json index 67a6f51..211eb32 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-dependency.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-dependency.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-empty-components.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-empty-components.json index 58678b8..7ffedf1 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-empty-components.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-empty-components.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [] diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-evidence.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-evidence.json index d59f71f..5e64c04 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-evidence.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-evidence.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-external-reference.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-external-reference.json index a54a326..bf45439 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-external-reference.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-external-reference.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-formulation.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-formulation.json index 64cba16..16a719e 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-formulation.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-formulation.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-expression.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-expression.json index cbda94a..5cc6829 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-expression.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-expression.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-id.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-id.json index 0f508a5..c784695 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-id.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-id.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-licensing.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-licensing.json index b220db7..57007b0 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-licensing.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-licensing.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-name.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-name.json index fede9a3..7ac9759 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-name.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-license-name.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-lifecycle.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-lifecycle.json index bafa7ab..2958fc2 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-lifecycle.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-lifecycle.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-machine-learning.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-machine-learning.json index 2c00ec5..6fddbe1 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-machine-learning.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-machine-learning.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-author.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-author.json index c83f25b..b2c6e32 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-author.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-author.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-license.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-license.json index b6f925c..8bcb9b2 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-license.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-license.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-manufacture.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-manufacture.json index 1922730..2b15cca 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-manufacture.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-manufacture.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-supplier.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-supplier.json index e10022e..d9a7806 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-supplier.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-supplier.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-timestamp.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-timestamp.json index 4c53dd3..6083a69 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-timestamp.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-timestamp.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-tool-deprecated.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-tool-deprecated.json index f31655f..ccc1aba 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-tool-deprecated.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-tool-deprecated.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-tool.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-tool.json index bc4535b..a3a4cae 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-tool.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-metadata-tool.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-minimal-viable.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-minimal-viable.json index 31d47d1..232d12b 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-minimal-viable.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-minimal-viable.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-patch.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-patch.json index 5b00b79..45a0f5e 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-patch.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-patch.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-properties.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-properties.json index 5130bae..8d5d16b 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-properties.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-properties.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-release-notes.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-release-notes.json index 792ad55..9badeb2 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-release-notes.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-release-notes.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-service-empty-objects.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-service-empty-objects.json index a2357bb..596cce0 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-service-empty-objects.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-service-empty-objects.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "services": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-service.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-service.json index 5f0a4c2..6f9549c 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-service.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-service.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-vulnerability.json b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-vulnerability.json index d496ddb..d13edde 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-vulnerability.json +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripJSON-func1-valid-vulnerability.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-annotation.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-annotation.xml index 67b1e83..383a934 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-annotation.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-annotation.xml @@ -1,5 +1,5 @@ - + Component A diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-assembly.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-assembly.xml index 0e674bb..f0beffe 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-assembly.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-assembly.xml @@ -1,5 +1,5 @@ - + acme-library-a diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-bom.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-bom.xml index 4c53cf6..f83bb18 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-bom.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-bom.xml @@ -1,5 +1,5 @@ - + 2020-04-07T07:01:00Z diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-hashes.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-hashes.xml index bd7af4e..60c6fcd 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-hashes.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-hashes.xml @@ -1,5 +1,5 @@ - + acme-example diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-omniborId.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-omniborId.xml new file mode 100644 index 0000000..7096153 --- /dev/null +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-omniborId.xml @@ -0,0 +1,12 @@ + + + + + Acme Super Heros + Acme Application + 9.1.1 + gitoid:blob:sha1:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3 + gitoid:blob:sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08 + + + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-ref.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-ref.xml index 8d04ed3..fefe10d 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-ref.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-ref.xml @@ -1,5 +1,5 @@ - + acme-library diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-swhid.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-swhid.xml new file mode 100644 index 0000000..167dae1 --- /dev/null +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-swhid.xml @@ -0,0 +1,12 @@ + + + + + Acme Super Heros + Acme Application + 9.1.1 + swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2 + swh:1:cnt:618152ea559a168bbcbb5e294a9ed024d3859793 + + + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-swid-full.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-swid-full.xml index 07459dd..70d0508 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-swid-full.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-swid-full.xml @@ -1,5 +1,5 @@ - + Acme Super Heros diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-swid.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-swid.xml index e3a308c..ce46055 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-swid.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-swid.xml @@ -1,5 +1,5 @@ - + Acme Super Heros diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-types.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-types.xml index 3b9ce9b..1d4f293 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-types.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-component-types.xml @@ -1,5 +1,5 @@ - + application-a diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-compositions.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-compositions.xml index 34baab1..0d8f4fb 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-compositions.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-compositions.xml @@ -1,5 +1,5 @@ - + Acme Application diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-dependency.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-dependency.xml index 8c7c54c..ab25d72 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-dependency.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-dependency.xml @@ -1,5 +1,5 @@ - + acme-library-a diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-empty-components.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-empty-components.xml index 7ea6dda..b411b69 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-empty-components.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-empty-components.xml @@ -1,2 +1,2 @@ - + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-evidence.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-evidence.xml index 8e35160..5a45cfd 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-evidence.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-evidence.xml @@ -1,5 +1,5 @@ - + com.google.code.findbugs diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-external-reference.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-external-reference.xml index e89c8b3..6ff6816 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-external-reference.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-external-reference.xml @@ -1,5 +1,5 @@ - + org.example diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-formulation.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-formulation.xml index c7ff248..1498f7e 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-formulation.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-formulation.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-expression.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-expression.xml index 5961c9d..1b562b1 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-expression.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-expression.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-id.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-id.xml index b288b92..e531c62 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-id.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-id.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-licensing.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-licensing.xml index 681362b..28552e1 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-licensing.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-licensing.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-name.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-name.xml index db0d80f..8b7cece 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-name.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-license-name.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-lifecycle.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-lifecycle.xml index 69b66e1..9df8a26 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-lifecycle.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-lifecycle.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-machine-learning.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-machine-learning.xml index 76276e9..c7b5bc4 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-machine-learning.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-machine-learning.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-author.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-author.xml index 634c9b8..331bf09 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-author.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-author.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-license.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-license.xml index 52c9233..ca87c7a 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-license.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-license.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-manufacture.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-manufacture.xml index 0c9cfbe..74460c2 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-manufacture.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-manufacture.xml @@ -1,5 +1,5 @@ - + Acme, Inc. diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-supplier.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-supplier.xml index bb1a4e0..835bbe9 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-supplier.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-supplier.xml @@ -1,5 +1,5 @@ - + Acme, Inc. diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-timestamp.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-timestamp.xml index f2d4a99..46838af 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-timestamp.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-timestamp.xml @@ -1,5 +1,5 @@ - + 2020-04-07T07:01:00Z diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-tool-deprecated.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-tool-deprecated.xml index bfe8af7..c506119 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-tool-deprecated.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-tool-deprecated.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-tool.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-tool.xml index 95b9eaa..1f5f6e1 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-tool.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-metadata-tool.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-minimal-viable.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-minimal-viable.xml index af1cb69..8d78761 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-minimal-viable.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-minimal-viable.xml @@ -1,5 +1,5 @@ - + acme-library diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-patch.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-patch.xml index 514512c..9a2d394 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-patch.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-patch.xml @@ -1,5 +1,5 @@ - + com.acme diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-properties.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-properties.xml index e66d784..9b126b2 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-properties.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-properties.xml @@ -1,5 +1,5 @@ - + Bar diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-release-notes.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-release-notes.xml index 96ce5b5..e27bdde 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-release-notes.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-release-notes.xml @@ -1,5 +1,5 @@ - + acme-example diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-service-empty-objects.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-service-empty-objects.xml index 8521883..7442f3c 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-service-empty-objects.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-service-empty-objects.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-service.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-service.xml index 77f59d3..cadf45c 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-service.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-service.xml @@ -1,5 +1,5 @@ - + com.acme diff --git a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-vulnerability.xml b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-vulnerability.xml index 0bf3c56..93ef9b6 100644 --- a/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-vulnerability.xml +++ b/testdata/snapshots/cyclonedx-go-TestRoundTripXML-func1-valid-vulnerability.xml @@ -1,5 +1,5 @@ - + com.fasterxml.jackson.core diff --git a/testdata/snapshots/cyclonedx-go-TestXmlBOMEncoder_EncodeVersion-func1-1.6.bom.xml b/testdata/snapshots/cyclonedx-go-TestXmlBOMEncoder_EncodeVersion-func1-1.6.bom.xml new file mode 100644 index 0000000..b82454b --- /dev/null +++ b/testdata/snapshots/cyclonedx-go-TestXmlBOMEncoder_EncodeVersion-func1-1.6.bom.xml @@ -0,0 +1,197 @@ + + + + 2020-04-07T07:01:00Z + + + + Awesome Vendor + Awesome Tool + 9.1.2 + + 25ed8e31b995bb927966616df2a42b979a2717f0 + a74f733635a19aefb1f73e5947cef59cd7440c6952ef0f03d09d974274cbd6df + + + + + + + Acme Org + https://example.com + + com.example + Acme Signing Server + Signs artifacts + + https://example.com/sign + https://example.com/verify + https://example.com/tsa + + + + + + + Samantha Wright + samantha.wright@example.com + 800-555-1212 + + + + Acme Super Heros + Acme Application + 9.1.1 + + PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxTb2Z0d2FyZUlkZW50aXR5IHhtbDpsYW5nPSJFTiIgbmFtZT0iQWNtZSBBcHBsaWNhdGlvbiIgdmVyc2lvbj0iOS4xLjEiIAogdmVyc2lvblNjaGVtZT0ibXVsdGlwYXJ0bnVtZXJpYyIgCiB0YWdJZD0ic3dpZGdlbi1iNTk1MWFjOS00MmMwLWYzODItM2YxZS1iYzdhMmE0NDk3Y2JfOS4xLjEiIAogeG1sbnM9Imh0dHA6Ly9zdGFuZGFyZHMuaXNvLm9yZy9pc28vMTk3NzAvLTIvMjAxNS9zY2hlbWEueHNkIj4gCiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiAKIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL3N0YW5kYXJkcy5pc28ub3JnL2lzby8xOTc3MC8tMi8yMDE1LWN1cnJlbnQvc2NoZW1hLnhzZCBzY2hlbWEueHNkIiA+CiAgPE1ldGEgZ2VuZXJhdG9yPSJTV0lEIFRhZyBPbmxpbmUgR2VuZXJhdG9yIHYwLjEiIC8+IAogIDxFbnRpdHkgbmFtZT0iQWNtZSwgSW5jLiIgcmVnaWQ9ImV4YW1wbGUuY29tIiByb2xlPSJ0YWdDcmVhdG9yIiAvPiAKPC9Tb2Z0d2FyZUlkZW50aXR5Pg== + + + + Acme, Inc. + https://example.com + + Acme Professional Services + professional.services@example.com + + + + Acme, Inc. + https://example.com + + Acme Distribution + distribution@example.com + + + + + + Acme Super Heros + Acme Inc + com.acme + tomcat-catalina + 9.0.14 + Modified version of Apache Catalina + required + + 3942447fac867ae5cdb3229b658f4d48 + e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a + f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b + e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282 + + + + Apache-2.0 + 
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License. + https://www.apache.org/licenses/LICENSE-2.0.txt + + + pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar + + + + Apache Super Heros + Apache + org.apache.tomcat + tomcat-catalina + 9.0.14 + Apache Catalina + + + Apache-2.0 + + + pkg:maven/org.apache.tomcat/tomcat-catalina@9.0.14?packaging=jar + + + + + 7638417db6d59f3c431d3e1f261cc637155684cd + https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd + + 2018-11-07T22:01:45Z + John Doe + john.doe@example.com + + + 2018-11-07T22:01:45Z + Jane Doe + jane.doe@example.com + + Initial commit + + + Commentary here + + + + + Example Inc. + https://example.com + https://example.net + + Example Support AMER + support@example.com + 800-555-1212 + + + Example Support APAC + support@apac.example.com + + + Example Super Heros + org.example + mylibrary + 1.0.0 + required + + 2342c2eaf1feb9a80195dbaddf2ebaa3 + 68b78babe00a053f9e35ec6a2d9080f5b90122b0 + 708f1f53b41f11f02d12a11b1a38d2905d47b099afc71a0f1124ef8582ec7313 + 387b7ae16b9cae45f830671541539bf544202faae5aac544a93b7b0a04f5f846fa2f4e81ef3f1677e13aed7496408a441f5657ab6d54423e56bf6f38da124aef + + + EPL-2.0 OR GPL-2.0-with-classpath-exception + + Copyright Example Inc. All rights reserved. + cpe:/a:example:myapplication:1.0.0 + pkg:maven/com.example/myapplication@1.0.0?packaging=war + + + http://example.org/docs + All component versions are documented here + + + http://example.org/security + + + + + Example Super Heros + com.example + myframework + 1.0.0 + Example Inc, enterprise framework + required + + cfcb0b64aacd2f81c1cd546543de965a + 7fbeef2346c45d565c3341f037bce4e088af8a52 + 0384db3cec55d86a6898c489fdb75a8e75fe66b26639634983d2f3c3558493d1 + 854909cdb9e3ca183056837144aab6d8069b377bd66445087cc7157bf0c3f620418705dd0b83bdc2f73a508c2bdb316ca1809d75ee6972d02023a3e7dd655c79 + + + + Some random license + + + pkg:maven/com.example/myframework@1.0.0?packaging=war + + + http://example.com/myframework + + + http://example.com/security + + + + + diff --git a/testdata/valid-annotation.json b/testdata/valid-annotation.json index e2f3085..f070659 100644 --- a/testdata/valid-annotation.json +++ b/testdata/valid-annotation.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-annotation.xml b/testdata/valid-annotation.xml index 3f8d3a9..5611bdf 100644 --- a/testdata/valid-annotation.xml +++ b/testdata/valid-annotation.xml @@ -1,5 +1,5 @@ - + Component A diff --git a/testdata/valid-assembly.json b/testdata/valid-assembly.json index aa26afe..681c10e 100644 --- a/testdata/valid-assembly.json +++ b/testdata/valid-assembly.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-assembly.xml b/testdata/valid-assembly.xml index a8e34d8..089ce08 100644 --- a/testdata/valid-assembly.xml +++ b/testdata/valid-assembly.xml @@ -1,5 +1,5 @@ - + acme-library-a diff --git a/testdata/valid-bom.json b/testdata/valid-bom.json index 1ea8669..00706d7 100644 --- a/testdata/valid-bom.json +++ b/testdata/valid-bom.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/valid-bom.xml b/testdata/valid-bom.xml index 244f947..bb5ceaf 100644 --- a/testdata/valid-bom.xml +++ b/testdata/valid-bom.xml @@ -1,5 +1,5 @@ - + 2020-04-07T07:01:00Z diff --git a/testdata/valid-component-hashes.json b/testdata/valid-component-hashes.json index bcba363..fcb58a9 100644 --- a/testdata/valid-component-hashes.json +++ b/testdata/valid-component-hashes.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-component-hashes.xml b/testdata/valid-component-hashes.xml index 37d05b9..4e5fcc6 100644 --- a/testdata/valid-component-hashes.xml +++ b/testdata/valid-component-hashes.xml @@ -1,5 +1,5 @@ - + acme-example diff --git a/testdata/valid-component-omniborId.json b/testdata/valid-component-omniborId.json new file mode 100644 index 0000000..886645e --- /dev/null +++ b/testdata/valid-component-omniborId.json @@ -0,0 +1,15 @@ +{ + "bomFormat": "CycloneDX", + "specVersion": "1.6", + "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", + "version": 1, + "components": [ + { + "type": "application", + "author": "Acme Super Heros", + "name": "Acme Application", + "version": "9.1.1", + "omniborId": ["gitoid:blob:sha1:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3"] + } + ] +} diff --git a/testdata/valid-component-omniborId.xml b/testdata/valid-component-omniborId.xml new file mode 100644 index 0000000..572b09d --- /dev/null +++ b/testdata/valid-component-omniborId.xml @@ -0,0 +1,12 @@ + + + + + Acme Super Heros + Acme Application + 9.1.1 + gitoid:blob:sha1:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3 + gitoid:blob:sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08 + + + diff --git a/testdata/valid-component-ref.json b/testdata/valid-component-ref.json index 3799d49..977fb1e 100644 --- a/testdata/valid-component-ref.json +++ b/testdata/valid-component-ref.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-component-ref.xml b/testdata/valid-component-ref.xml index 46448db..b65c42d 100644 --- a/testdata/valid-component-ref.xml +++ b/testdata/valid-component-ref.xml @@ -1,5 +1,5 @@ - + acme-library diff --git a/testdata/valid-component-swhid.json b/testdata/valid-component-swhid.json new file mode 100644 index 0000000..32b1b93 --- /dev/null +++ b/testdata/valid-component-swhid.json @@ -0,0 +1,15 @@ +{ + "bomFormat": "CycloneDX", + "specVersion": "1.6", + "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", + "version": 1, + "components": [ + { + "type": "application", + "author": "Acme Super Heros", + "name": "Acme Application", + "version": "9.1.1", + "swhid": ["swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2"] + } + ] +} diff --git a/testdata/valid-component-swhid.xml b/testdata/valid-component-swhid.xml new file mode 100644 index 0000000..23cb75b --- /dev/null +++ b/testdata/valid-component-swhid.xml @@ -0,0 +1,12 @@ + + + + + Acme Super Heros + Acme Application + 9.1.1 + swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2 + swh:1:cnt:618152ea559a168bbcbb5e294a9ed024d3859793 + + + diff --git a/testdata/valid-component-swid-full.json b/testdata/valid-component-swid-full.json index 59cb168..576131c 100644 --- a/testdata/valid-component-swid-full.json +++ b/testdata/valid-component-swid-full.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-component-swid-full.xml b/testdata/valid-component-swid-full.xml index bb1c81a..f0f7d40 100644 --- a/testdata/valid-component-swid-full.xml +++ b/testdata/valid-component-swid-full.xml @@ -1,5 +1,5 @@ - + Acme Super Heros diff --git a/testdata/valid-component-swid.json b/testdata/valid-component-swid.json index f28e9de..9b63b94 100644 --- a/testdata/valid-component-swid.json +++ b/testdata/valid-component-swid.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-component-swid.xml b/testdata/valid-component-swid.xml index 9e4a0a1..3d4a954 100644 --- a/testdata/valid-component-swid.xml +++ b/testdata/valid-component-swid.xml @@ -1,5 +1,5 @@ - + Acme Super Heros diff --git a/testdata/valid-component-types.json b/testdata/valid-component-types.json index 6359068..782e701 100644 --- a/testdata/valid-component-types.json +++ b/testdata/valid-component-types.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-component-types.xml b/testdata/valid-component-types.xml index 128a159..b66c396 100644 --- a/testdata/valid-component-types.xml +++ b/testdata/valid-component-types.xml @@ -1,5 +1,5 @@ - + application-a diff --git a/testdata/valid-compositions.json b/testdata/valid-compositions.json index 11c8a00..b42952e 100644 --- a/testdata/valid-compositions.json +++ b/testdata/valid-compositions.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/valid-compositions.xml b/testdata/valid-compositions.xml index 06800df..0806cad 100644 --- a/testdata/valid-compositions.xml +++ b/testdata/valid-compositions.xml @@ -1,5 +1,5 @@ - + Acme Application diff --git a/testdata/valid-dependency.json b/testdata/valid-dependency.json index fcaec59..3d24654 100644 --- a/testdata/valid-dependency.json +++ b/testdata/valid-dependency.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-dependency.xml b/testdata/valid-dependency.xml index 1f02a1e..903670c 100644 --- a/testdata/valid-dependency.xml +++ b/testdata/valid-dependency.xml @@ -1,5 +1,5 @@ - + acme-library-a diff --git a/testdata/valid-empty-components.json b/testdata/valid-empty-components.json index 3c85b6a..572b398 100644 --- a/testdata/valid-empty-components.json +++ b/testdata/valid-empty-components.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-empty-components.xml b/testdata/valid-empty-components.xml index 03cd10b..58f7c84 100644 --- a/testdata/valid-empty-components.xml +++ b/testdata/valid-empty-components.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/valid-evidence.json b/testdata/valid-evidence.json index 9274023..2d6187d 100644 --- a/testdata/valid-evidence.json +++ b/testdata/valid-evidence.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-evidence.xml b/testdata/valid-evidence.xml index 9dd5127..6efdda2 100644 --- a/testdata/valid-evidence.xml +++ b/testdata/valid-evidence.xml @@ -1,5 +1,5 @@ - + com.google.code.findbugs diff --git a/testdata/valid-external-reference.json b/testdata/valid-external-reference.json index 78a3eb6..e3913d8 100644 --- a/testdata/valid-external-reference.json +++ b/testdata/valid-external-reference.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-external-reference.xml b/testdata/valid-external-reference.xml index 0599884..21810f3 100644 --- a/testdata/valid-external-reference.xml +++ b/testdata/valid-external-reference.xml @@ -1,5 +1,5 @@ - + org.example diff --git a/testdata/valid-formulation.json b/testdata/valid-formulation.json index 9f9490a..9169d9c 100644 --- a/testdata/valid-formulation.json +++ b/testdata/valid-formulation.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-formulation.xml b/testdata/valid-formulation.xml index 8492e4b..7f500a3 100644 --- a/testdata/valid-formulation.xml +++ b/testdata/valid-formulation.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/valid-license-expression.json b/testdata/valid-license-expression.json index 98b34e9..1e684ea 100644 --- a/testdata/valid-license-expression.json +++ b/testdata/valid-license-expression.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-license-expression.xml b/testdata/valid-license-expression.xml index 6b14620..54e7f99 100644 --- a/testdata/valid-license-expression.xml +++ b/testdata/valid-license-expression.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/valid-license-id.json b/testdata/valid-license-id.json index 5f13e01..c6b34bb 100644 --- a/testdata/valid-license-id.json +++ b/testdata/valid-license-id.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-license-id.xml b/testdata/valid-license-id.xml index 242a0a9..d62de88 100644 --- a/testdata/valid-license-id.xml +++ b/testdata/valid-license-id.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/valid-license-licensing.json b/testdata/valid-license-licensing.json index 84c4719..df2e9c7 100644 --- a/testdata/valid-license-licensing.json +++ b/testdata/valid-license-licensing.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-license-licensing.xml b/testdata/valid-license-licensing.xml index a528a17..35447cf 100644 --- a/testdata/valid-license-licensing.xml +++ b/testdata/valid-license-licensing.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/valid-license-name.json b/testdata/valid-license-name.json index b856f70..467222b 100644 --- a/testdata/valid-license-name.json +++ b/testdata/valid-license-name.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-license-name.xml b/testdata/valid-license-name.xml index fee242f..f37b41e 100644 --- a/testdata/valid-license-name.xml +++ b/testdata/valid-license-name.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/valid-lifecycle.json b/testdata/valid-lifecycle.json index c08a076..ef09df9 100644 --- a/testdata/valid-lifecycle.json +++ b/testdata/valid-lifecycle.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/valid-lifecycle.xml b/testdata/valid-lifecycle.xml index 824093e..8b4a845 100644 --- a/testdata/valid-lifecycle.xml +++ b/testdata/valid-lifecycle.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/valid-machine-learning.json b/testdata/valid-machine-learning.json index 59dc3ce..0aeef9b 100644 --- a/testdata/valid-machine-learning.json +++ b/testdata/valid-machine-learning.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-machine-learning.xml b/testdata/valid-machine-learning.xml index 7c541ec..aff6268 100644 --- a/testdata/valid-machine-learning.xml +++ b/testdata/valid-machine-learning.xml @@ -1,5 +1,5 @@ - + Acme Inc diff --git a/testdata/valid-metadata-author.json b/testdata/valid-metadata-author.json index c5471c2..c63b706 100644 --- a/testdata/valid-metadata-author.json +++ b/testdata/valid-metadata-author.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/valid-metadata-author.xml b/testdata/valid-metadata-author.xml index 3085a30..a821778 100644 --- a/testdata/valid-metadata-author.xml +++ b/testdata/valid-metadata-author.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/valid-metadata-license.json b/testdata/valid-metadata-license.json index 5016d6a..84b43e7 100644 --- a/testdata/valid-metadata-license.json +++ b/testdata/valid-metadata-license.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/valid-metadata-license.xml b/testdata/valid-metadata-license.xml index 60212fa..a319587 100644 --- a/testdata/valid-metadata-license.xml +++ b/testdata/valid-metadata-license.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/valid-metadata-manufacture.json b/testdata/valid-metadata-manufacture.json index 6323f00..cbd80db 100644 --- a/testdata/valid-metadata-manufacture.json +++ b/testdata/valid-metadata-manufacture.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/valid-metadata-manufacture.xml b/testdata/valid-metadata-manufacture.xml index 7949391..5f419f1 100644 --- a/testdata/valid-metadata-manufacture.xml +++ b/testdata/valid-metadata-manufacture.xml @@ -1,5 +1,5 @@ - + Acme, Inc. diff --git a/testdata/valid-metadata-supplier.json b/testdata/valid-metadata-supplier.json index e445641..105c9cf 100644 --- a/testdata/valid-metadata-supplier.json +++ b/testdata/valid-metadata-supplier.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/valid-metadata-supplier.xml b/testdata/valid-metadata-supplier.xml index 2ed3c91..e533404 100644 --- a/testdata/valid-metadata-supplier.xml +++ b/testdata/valid-metadata-supplier.xml @@ -1,5 +1,5 @@ - + Acme, Inc. diff --git a/testdata/valid-metadata-timestamp.json b/testdata/valid-metadata-timestamp.json index 1d54539..9020021 100644 --- a/testdata/valid-metadata-timestamp.json +++ b/testdata/valid-metadata-timestamp.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/valid-metadata-timestamp.xml b/testdata/valid-metadata-timestamp.xml index fb1e823..1136bc4 100644 --- a/testdata/valid-metadata-timestamp.xml +++ b/testdata/valid-metadata-timestamp.xml @@ -1,5 +1,5 @@ - + 2020-04-07T07:01:00Z diff --git a/testdata/valid-metadata-tool-deprecated.json b/testdata/valid-metadata-tool-deprecated.json index 7e578d7..13b518d 100644 --- a/testdata/valid-metadata-tool-deprecated.json +++ b/testdata/valid-metadata-tool-deprecated.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/valid-metadata-tool-deprecated.xml b/testdata/valid-metadata-tool-deprecated.xml index 87a399f..5e90b4b 100644 --- a/testdata/valid-metadata-tool-deprecated.xml +++ b/testdata/valid-metadata-tool-deprecated.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/valid-metadata-tool.json b/testdata/valid-metadata-tool.json index aa55d67..53c69bb 100644 --- a/testdata/valid-metadata-tool.json +++ b/testdata/valid-metadata-tool.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/valid-metadata-tool.xml b/testdata/valid-metadata-tool.xml index 2d3129a..9e54701 100644 --- a/testdata/valid-metadata-tool.xml +++ b/testdata/valid-metadata-tool.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/valid-minimal-viable.json b/testdata/valid-minimal-viable.json index 5000812..14bdaba 100644 --- a/testdata/valid-minimal-viable.json +++ b/testdata/valid-minimal-viable.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-minimal-viable.xml b/testdata/valid-minimal-viable.xml index f792405..56e9c31 100644 --- a/testdata/valid-minimal-viable.xml +++ b/testdata/valid-minimal-viable.xml @@ -1,5 +1,5 @@ - + acme-library diff --git a/testdata/valid-patch.json b/testdata/valid-patch.json index 6639bea..56f3dec 100644 --- a/testdata/valid-patch.json +++ b/testdata/valid-patch.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-patch.xml b/testdata/valid-patch.xml index 409798f..b543548 100644 --- a/testdata/valid-patch.xml +++ b/testdata/valid-patch.xml @@ -1,5 +1,5 @@ - + com.acme diff --git a/testdata/valid-properties.json b/testdata/valid-properties.json index 24ce5de..237f7fe 100644 --- a/testdata/valid-properties.json +++ b/testdata/valid-properties.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/testdata/valid-properties.xml b/testdata/valid-properties.xml index 91a1916..32cd224 100644 --- a/testdata/valid-properties.xml +++ b/testdata/valid-properties.xml @@ -1,5 +1,5 @@ - + Bar diff --git a/testdata/valid-release-notes.json b/testdata/valid-release-notes.json index 8c4268e..bbdd00d 100644 --- a/testdata/valid-release-notes.json +++ b/testdata/valid-release-notes.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-release-notes.xml b/testdata/valid-release-notes.xml index 490969e..f7ce16b 100644 --- a/testdata/valid-release-notes.xml +++ b/testdata/valid-release-notes.xml @@ -1,5 +1,5 @@ - + acme-example diff --git a/testdata/valid-service-empty-objects.json b/testdata/valid-service-empty-objects.json index 14b70f4..d77ba2d 100644 --- a/testdata/valid-service-empty-objects.json +++ b/testdata/valid-service-empty-objects.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "services": [ diff --git a/testdata/valid-service-empty-objects.xml b/testdata/valid-service-empty-objects.xml index 59f6f5f..38023db 100644 --- a/testdata/valid-service-empty-objects.xml +++ b/testdata/valid-service-empty-objects.xml @@ -1,5 +1,5 @@ - + diff --git a/testdata/valid-service.json b/testdata/valid-service.json index 091fab1..71a49ca 100644 --- a/testdata/valid-service.json +++ b/testdata/valid-service.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-service.xml b/testdata/valid-service.xml index 03bc664..26ec846 100644 --- a/testdata/valid-service.xml +++ b/testdata/valid-service.xml @@ -1,5 +1,5 @@ - + com.acme diff --git a/testdata/valid-vulnerability.json b/testdata/valid-vulnerability.json index a529a53..d6166ec 100644 --- a/testdata/valid-vulnerability.json +++ b/testdata/valid-vulnerability.json @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/testdata/valid-vulnerability.xml b/testdata/valid-vulnerability.xml index d356d6b..1ce2996 100644 --- a/testdata/valid-vulnerability.xml +++ b/testdata/valid-vulnerability.xml @@ -1,5 +1,5 @@ - + com.fasterxml.jackson.core diff --git a/validate_json_test.go b/validate_json_test.go index aa22982..6269759 100644 --- a/validate_json_test.go +++ b/validate_json_test.go @@ -28,6 +28,7 @@ var jsonSchemaFiles = map[SpecVersion]string{ SpecVersion1_3: "file://./schema/bom-1.3.schema.json", SpecVersion1_4: "file://./schema/bom-1.4.schema.json", SpecVersion1_5: "file://./schema/bom-1.5.schema.json", + SpecVersion1_6: "file://./schema/bom-1.6.schema.json", } type jsonValidator struct{} diff --git a/validate_xml_test.go b/validate_xml_test.go index e678b49..d519f6f 100644 --- a/validate_xml_test.go +++ b/validate_xml_test.go @@ -31,6 +31,7 @@ var xmlSchemaFiles = map[SpecVersion]string{ SpecVersion1_3: "./schema/bom-1.3.xsd", SpecVersion1_4: "./schema/bom-1.4.xsd", SpecVersion1_5: "./schema/bom-1.5.xsd", + SpecVersion1_6: "./schema/bom-1.6.xsd", } var xsdValidateInitOnce sync.Once