Skip to content

Commit c152850

Browse files
jkowalleckjkowalleck
committed
Merge remote-tracking branch 'origin/6.x-dev'
2 parents 097db91 + 748e4f1 commit c152850

40 files changed

+932
-263
lines changed

‎HISTORY.md

+8
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ All notable changes to this project will be documented in this file.
2525
[#1163]: https://github.com/CycloneDX/cyclonedx-javascript-library/pull/1163
2626
[#1173]: https://github.com/CycloneDX/cyclonedx-javascript-library/pull/1173
2727

28+
## 6.13.0 -- 2024-11-18
29+
30+
* Added
31+
* Support CycloneDX 1.6.1 ([#1176] via [#1177])
32+
33+
[#1176]: https://github.com/CycloneDX/cyclonedx-javascript-library/issues/1176
34+
[#1177]: https://github.com/CycloneDX/cyclonedx-javascript-library/pull/1177
35+
2836
## 6.12.0 -- 2024-11-12
2937

3038
* Added

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cyclonedx/cyclonedx-library",
3-
"version": "6.12.0",
3+
"version": "6.13.0",
44
"description": "Core functionality of CycloneDX for JavaScript (Node.js or WebBrowser).",
55
"license": "Apache-2.0",
66
"keywords": [

‎res/schema/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ some schema for offline use as download via [script](../../tools/schema-download
44
original sources: <https://github.com/CycloneDX/specification/blob/master>
55

66
Currently using version
7-
[5f3ee8066491d31ec6a6d02968243d9688d7e49c](https://github.com/CycloneDX/specification/commit/5f3ee8066491d31ec6a6d02968243d9688d7e49c)
7+
[8a27bfd1be5be0dcb2c208a34d2f4fa0b6d75bd7](https://github.com/CycloneDX/specification/commit/8a27bfd1be5be0dcb2c208a34d2f4fa0b6d75bd7)
88

99
| file | note |
1010
|------|------|

‎res/schema/bom-1.6.SNAPSHOT.schema.json

+90-64
Large diffs are not rendered by default.

‎res/schema/bom-1.6.SNAPSHOT.xsd

+233-91
Large diffs are not rendered by default.

‎tests/_data/schemaTestData/1.6/valid-annotation-1.6.json

+7
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,13 @@
7777
"name": "Partner Org",
7878
"url": [
7979
"https://partner.org"
80+
],
81+
"contact" : [
82+
{
83+
"name": "Support",
84+
"email": "[email protected]",
85+
"phone": "800-555-1212"
86+
}
8087
]
8188
},
8289
"group": "org.partner",

‎tests/_data/schemaTestData/1.6/valid-annotation-1.6.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</contact>
2222
</organization>
2323
</annotator>
24-
<timestamp>2020-04-07T07:01:00Z</timestamp>
24+
<timestamp>2022-01-01T00:00:00Z</timestamp>
2525
<text>This is a sample annotation made by an organization</text>
2626
</annotation>
2727
<annotation bom-ref="annotation-2">
@@ -35,8 +35,8 @@
3535
<phone>800-555-1212</phone>
3636
</individual>
3737
</annotator>
38-
<timestamp>2020-04-07T07:01:00Z</timestamp>
39-
<text>This is a sample annotation made by an person</text>
38+
<timestamp>2022-01-01T00:00:00Z</timestamp>
39+
<text>This is a sample annotation made by a person</text>
4040
</annotation>
4141
<annotation bom-ref="annotation-3">
4242
<subjects>
@@ -48,7 +48,7 @@
4848
<version>9.1.2</version>
4949
</component>
5050
</annotator>
51-
<timestamp>2020-04-07T07:01:00Z</timestamp>
51+
<timestamp>2022-01-01T00:00:00Z</timestamp>
5252
<text>This is a sample annotation made by a component</text>
5353
</annotation>
5454
<annotation bom-ref="annotation-4">
@@ -62,7 +62,7 @@
6262
<url>https://partner.org</url>
6363
<contact>
6464
<name>Support</name>
65-
<email>support@partner</email>
65+
<email>support@partner.org</email>
6666
<phone>800-555-1212</phone>
6767
</contact>
6868
</provider>
@@ -76,11 +76,11 @@
7676
<authenticated>true</authenticated>
7777
<x-trust-boundary>true</x-trust-boundary>
7878
<data>
79-
<classification flow="bi-directional">pubic</classification>
79+
<classification flow="bi-directional">public</classification>
8080
</data>
8181
</service>
8282
</annotator>
83-
<timestamp>2020-04-07T07:01:00Z</timestamp>
83+
<timestamp>2022-01-01T00:00:00Z</timestamp>
8484
<text>This is a sample annotation made by a service</text>
8585
</annotation>
8686
</annotations>

‎tests/_data/schemaTestData/1.6/valid-attestation-1.6.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<declarations>
44
<assessors>
55
<assessor bom-ref="assessor-1">
6-
<thirdParty>false</thirdParty>
6+
<thirdParty>true</thirdParty>
77
<organization>
8-
<name>Acme Inc</name>
8+
<name>Assessors Inc</name>
99
</organization>
1010
</assessor>
1111
</assessors>
@@ -25,7 +25,7 @@
2525
<score>0.8</score>
2626
<rationale>Conformance rationale here</rationale>
2727
<mitigationStrategies>
28-
<mitigationStrategy>mitigations-1</mitigationStrategy>
28+
<mitigationStrategy>mitigationStrategy-1</mitigationStrategy>
2929
</mitigationStrategies>
3030
</conformance>
3131
<confidence>
@@ -110,7 +110,7 @@
110110
<contents>
111111
<attachment content-type="text/plain">Mitigation strategy here</attachment>
112112
</contents>
113-
<classification>Public</classification>
113+
<classification>Company Confidential</classification>
114114
<sensitiveData>Describe sensitive data here</sensitiveData>
115115
</data>
116116
<created>2023-04-25T00:00:00+00:00</created>

‎tests/_data/schemaTestData/1.6/valid-bom-1.6.json

+121-24
Large diffs are not rendered by default.

‎tests/_data/schemaTestData/1.6/valid-bom-1.6.xml

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
33
<metadata>
4-
<timestamp>2020-04-07T07:01:00Z</timestamp>
4+
<timestamp>2020-04-13T20:20:39+00:00</timestamp>
55
<tools>
66
<tool>
77
<vendor>Awesome Vendor</vendor>
@@ -46,7 +46,7 @@
4646
</supplier>
4747
</metadata>
4848
<components>
49-
<component type="application">
49+
<component type="application" bom-ref="pkg:maven/com.acme/[email protected]?packaging=jar">
5050
<author>Joane Doe et al.</author>
5151
<publisher>Acme Inc</publisher>
5252
<group>com.acme</group>
@@ -90,7 +90,7 @@
9090
<uid>7638417db6d59f3c431d3e1f261cc637155684cd</uid>
9191
<url>https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd</url>
9292
<author>
93-
<timestamp>2018-11-07T22:01:45Z</timestamp>
93+
<timestamp>2018-11-13T20:20:39+00:00</timestamp>
9494
<name>John Doe</name>
9595
<email>[email protected]</email>
9696
</author>
@@ -105,9 +105,9 @@
105105
<notes>Commentary here</notes>
106106
</pedigree>
107107
</component>
108-
<component type="library">
108+
<component type="library" bom-ref="pkg:maven/com.example/[email protected]?packaging=war">
109109
<supplier>
110-
<name>Example Inc.</name>
110+
<name>Example, Inc.</name>
111111
<url>https://example.com</url>
112112
<url>https://example.net</url>
113113
<contact>
@@ -121,7 +121,7 @@
121121
</contact>
122122
</supplier>
123123
<manufacturer>
124-
<name>Example-2, Inc.Example-2, Inc.</name>
124+
<name>Example-2, Inc.</name>
125125
<url>https://example.org</url>
126126
<contact>
127127
<email>[email protected]</email>
@@ -195,4 +195,9 @@
195195
</externalReferences>
196196
</component>
197197
</components>
198+
<dependencies>
199+
<dependency ref="pkg:maven/com.acme/[email protected]?packaging=jar">
200+
<dependency ref="pkg:maven/com.example/[email protected]?packaging=war"/>
201+
</dependency>
202+
</dependencies>
198203
</bom>

‎tests/_data/schemaTestData/1.6/valid-component-data-1.6.json

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
3+
"bomFormat": "CycloneDX",
4+
"specVersion": "1.6",
5+
"serialNumber": "urn:uuid:1b1bff0e-fdb9-4088-8b9a-1a9f2d9006da",
6+
"version": 1,
7+
"components": [
8+
{
9+
"type": "data",
10+
"name": "my-configs",
11+
"version": "1337",
12+
"data": [
13+
{
14+
"type": "configuration",
15+
"name": "app.ini",
16+
"contents": {
17+
"url": "https://example.com/cfg/1337/app.ini"
18+
}
19+
},
20+
{
21+
"type": "other",
22+
"name": ".env",
23+
"contents": {
24+
"url": "https://example.com/cfg/1337/env"
25+
}
26+
}
27+
]
28+
}
29+
]
30+
}

‎tests/_data/schemaTestData/1.6/valid-component-data-1.6.xml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0"?>
2+
<bom serialNumber="urn:uuid:1b1bff0e-fdb9-4088-8b9a-1a9f2d9006da" version="1"
3+
xmlns="http://cyclonedx.org/schema/bom/1.6">
4+
<components>
5+
<component type="data">
6+
<name>my-configs</name>
7+
<version>1337</version>
8+
<data>
9+
<type>configuration</type>
10+
<name>app.ini</name>
11+
<contents>
12+
<url>https://example.com/cfg/1337/app.ini</url>
13+
</contents>
14+
</data>
15+
<data>
16+
<type>other</type>
17+
<name>.env</name>
18+
<contents>
19+
<url>https://example.com/cfg/1337/env</url>
20+
</contents>
21+
</data>
22+
</component>
23+
</components>
24+
</bom>

‎tests/_data/schemaTestData/1.6/valid-component-ref-1.6.json

+10-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,19 @@
99
"type": "library",
1010
"bom-ref": "123",
1111
"name": "acme-library",
12-
"version": "1.0.0"
12+
"version": "1.0.0",
13+
"components" : [
14+
{
15+
"type": "library",
16+
"bom-ref": "456",
17+
"name": "acme-library",
18+
"version": "1.0.0"
19+
}
20+
]
1321
},
1422
{
1523
"type": "library",
16-
"bom-ref": "456",
24+
"bom-ref": "789",
1725
"name": "acme-library",
1826
"version": "1.0.0"
1927
}

‎tests/_data/schemaTestData/1.6/valid-component-types-1.6.json

+5
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
"type": "file",
4545
"name": "file-a",
4646
"version": "1.0"
47+
},
48+
{
49+
"type": "data",
50+
"name": "data-a",
51+
"version": "1.0"
4752
}
4853
]
4954
}

‎tests/_data/schemaTestData/1.6/valid-component-types-1.6.xml

+4
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,9 @@
3333
<name>file-a</name>
3434
<version>1.0</version>
3535
</component>
36+
<component type="data">
37+
<name>data-a</name>
38+
<version>1.0</version>
39+
</component>
3640
</components>
3741
</bom>

‎tests/_data/schemaTestData/1.6/valid-compositions-1.6.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</component>
2222
<component type="library" bom-ref="pkg:maven/acme/[email protected]">
2323
<name>Acme Library</name>
24-
<version>2.0</version>
24+
<version>3.0</version>
2525
<purl>pkg:maven/acme/[email protected]</purl>
2626
</component>
2727
</components>
@@ -49,9 +49,9 @@
4949
</composition>
5050
<composition>
5151
<aggregate>incomplete_first_party_only</aggregate>
52-
<assemblies>
53-
<assembly ref="vulnerability-1"/>
54-
</assemblies>
52+
<vulnerabilities>
53+
<vulnerability ref="vulnerability-1"/>
54+
</vulnerabilities>
5555
</composition>
5656
</compositions>
5757
<vulnerabilities>

‎tests/_data/schemaTestData/1.6/valid-cryptography-implementation-1.6.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
</cryptoProperties>
3232
</component>
3333
<component type="library" bom-ref="crypto-library">
34-
<name>Crypto Library</name>
34+
<name>Crypto library</name>
3535
<version>1.0.0</version>
3636
</component>
3737
<component type="library" bom-ref="some-library">
38-
<name>Some Library</name>
38+
<name>Some library</name>
3939
<version>1.0.0</version>
4040
</component>
4141
</components>

‎tests/_data/schemaTestData/1.6/valid-dependency-1.6.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
33
<components>
44
<component type="library" bom-ref="library-a">
5-
<name>acme-library-a</name>
5+
<name>library-a</name>
66
<version>1.0.0</version>
77
</component>
88
<component type="library" bom-ref="library-b">
9-
<name>acme-library-b</name>
9+
<name>library-b</name>
1010
<version>1.0.0</version>
1111
</component>
1212
<component type="library" bom-ref="library-c">
13-
<name>acme-library-b</name>
13+
<name>library-c</name>
1414
<version>1.0.0</version>
1515
</component>
1616
</components>

0 commit comments

Comments
 (0)