Skip to content

Commit e90504b

Browse files
jkowalleckjkowalleck
authored
Merge branch 'master' into spdx-schema_pull-latest
2 parents 805ed58 + 4b3f594 commit e90504b

283 files changed

Lines changed: 40385 additions & 40 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/test_js.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ jobs:
2929
uses: actions/checkout@v5
3030
- name: Setup Node.js
3131
# see https://github.com/actions/setup-node
32-
uses: actions/setup-node@v5
32+
uses: actions/setup-node@v6
3333
with:
3434
node-version: '20.x'
35+
package-manager-cache: false
3536
- name: Install Depenencies
3637
run: npm install
3738
- name: Run test

‎README.md‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
[![Build Docs](https://github.com/CycloneDX/specification/actions/workflows/build_docs.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/build_docs.yml)
2-
[![CT Java](https://github.com/CycloneDX/specification/actions/workflows/test_java.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_java.yml)
3-
[![CT JavaScript](https://github.com/CycloneDX/specification/actions/workflows/test_js.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_js.yml)
4-
[![CT PHP](https://github.com/CycloneDX/specification/actions/workflows/test_php.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_php.yml)
5-
[![CT ProtoBuf](https://github.com/CycloneDX/specification/actions/workflows/test_proto.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_proto.yml)
1+
2+
# CycloneDX Bill of Materials Specification (ECMA-424)
3+
64
[![License][license-image]][license-url]
5+
[![ECMA TC54](https://img.shields.io/badge/ECMA-TC54-FC7C00?labelColor=404040)](https://tc54.org)
76
[![Website](https://img.shields.io/badge/https://-cyclonedx.org-blue.svg)](https://cyclonedx.org/)
87
[![Slack Invite](https://img.shields.io/badge/Slack-Join-blue?logo=slack&labelColor=393939)](https://cyclonedx.org/slack/invite)
98
[![Group Discussion](https://img.shields.io/badge/discussion-groups.io-blue.svg)](https://groups.io/g/CycloneDX)
10-
[![Twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&label=Follow)](https://twitter.com/CycloneDX_Spec)
11-
[![ECMA TC54](https://img.shields.io/badge/ECMA-TC54-FC7C00?labelColor=404040)](https://tc54.org)
9+
[![Twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&label=Follow)](https://twitter.com/CycloneDX_Spec)
10+
[![Build Docs](https://github.com/CycloneDX/specification/actions/workflows/build_docs.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/build_docs.yml)
11+
[![CT Java](https://github.com/CycloneDX/specification/actions/workflows/test_java.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_java.yml)
12+
[![CT JavaScript](https://github.com/CycloneDX/specification/actions/workflows/test_js.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_js.yml)
13+
[![CT PHP](https://github.com/CycloneDX/specification/actions/workflows/test_php.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_php.yml)
14+
[![CT ProtoBuf](https://github.com/CycloneDX/specification/actions/workflows/test_proto.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_proto.yml)
1215

16+
----
1317

14-
# CycloneDX Bill of Materials Specification (ECMA-424)
1518
OWASP CycloneDX is a full-stack Bill of Materials (BOM) standard that provides advanced supply chain capabilities for
1619
cyber risk reduction. CycloneDX is an [Ecma International](https://ecma-international.org/) standard published as
1720
[ECMA-424](https://ecma-international.org/publications-and-standards/standards/ecma-424/).
@@ -74,6 +77,7 @@ Alternatively, files that match the glob pattern below are also recognized:
7477

7578
| Version | Release Date |
7679
|-------------------|-----------------|
80+
| CycloneDX 1.7 | 21 October 2025 |
7781
| CycloneDX 1.6 | 09 April 2024 |
7882
| CycloneDX 1.5 | 26 June 2023 |
7983
| CycloneDX 1.4 | 12 January 2022 |

‎docgen/json/gen.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set -eu
33

44
declare -a CDX_VERSIONS=(
5+
'1.7'
56
'1.6'
67
'1.5'
78
'1.4'

‎docgen/json/templates/cyclonedx/base.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,14 @@
4040
v${version} (JSON)
4141
</a>
4242
<ul class="dropdown-menu" aria-labelledby="navbarScrollingDropdown">
43+
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
4344
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
4445
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
4546
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
4647
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
4748
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
4849
<li><hr class="dropdown-divider"/></li>
50+
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
4951
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
5052
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
5153
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
@@ -54,6 +56,7 @@
5456
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
5557
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
5658
<li><hr class="dropdown-divider"/></li>
59+
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
5760
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
5861
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
5962
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>

‎docgen/proto/gen.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set -eu
33

44
declare -a CDX_VERSIONS=(
5+
'1.7'
56
'1.6'
67
'1.5'
78
'1.4'

‎docgen/proto/templates/html.tmpl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,14 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
271271
v${version} (Protobuf)
272272
</a>
273273
<ul class="dropdown-menu" aria-labelledby="navbarScrollingDropdown">
274+
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
274275
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
275276
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
276277
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
277278
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
278279
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
279280
<li><hr class="dropdown-divider"/></li>
281+
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
280282
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
281283
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
282284
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
@@ -285,6 +287,7 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
285287
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
286288
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
287289
<li><hr class="dropdown-divider"/></li>
290+
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
288291
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
289292
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
290293
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>

‎docgen/xml/gen.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set -eu
33

44
declare -a CDX_VERSIONS=(
5+
'1.7'
56
'1.6'
67
'1.5'
78
'1.4'

‎docgen/xml/xs3p.xsl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,14 @@
340340
<li class="dropdown">
341341
<a href="#" class="dropdown-toggle version-selector" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">v<xsl:value-of select="$cycloneDxVersion"/> (XML)<span class="caret"></span></a>
342342
<ul class="dropdown-menu">
343+
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
343344
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
344345
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
345346
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
346347
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
347348
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
348349
<li style="padding:0"><hr class="dropdown-divider"/></li>
350+
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
349351
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
350352
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
351353
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
@@ -354,6 +356,7 @@
354356
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
355357
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
356358
<li style="padding:0"><hr class="dropdown-divider"/></li>
359+
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
357360
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
358361
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
359362
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>

‎schema/bom-1.4.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ message VulnerabilityAffectedVersions {
662662
oneof choice {
663663
// A single version of a component or service.
664664
string version = 1;
665-
// A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst
665+
// A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec
666666
string range = 2;
667667
}
668668
// The vulnerability status for the version or range of versions.

‎schema/bom-1.4.schema.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,7 +1640,7 @@
16401640
"$ref": "#/definitions/version"
16411641
},
16421642
"range": {
1643-
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst",
1643+
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec",
16441644
"$ref": "#/definitions/range"
16451645
},
16461646
"status": {
@@ -1683,7 +1683,7 @@
16831683
"maxLength": 1024
16841684
},
16851685
"range": {
1686-
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/blob/master/VERSION-RANGE-SPEC.rst",
1686+
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec",
16871687
"type": "string",
16881688
"minLength": 1,
16891689
"maxLength": 1024

0 commit comments

Comments
 (0)