Skip to content

Commit 11c0e00

Browse files
stevespringettstevespringett
authored
v1.7 (#511)
## Fixed * XML schema: add type for `ComponentData` sub-elements ([#600] via [#601]) * JSON schema: added the correct `deprecated` mark for already deprecated structures (via [a973a6b]) ## Deprecated * Deprecated various fields and structures related to _cryptographic transparency_ - _CBOM_ . (via [#657]) Use the newly added structures and fields for detailing the information instead. ## Changed * Extended the scope of _formulations_. (via [#647]) From now on, _formulations_ may be used to describe how any referencable object within the BOM came together, including components, services, metadata, declarations, or the BOM itself. Before, it was restricted to components and services. ## Added * Support for _external components_ with _version-ranges_ ([#321] via [#586]) * Support for _multiple_ SPDX License Expressions alongside with other licenses ([#454] via [#582]) * Support for _Streebog hashing algorithm_ ([#485] via [#525]) * Support for license expression _details and properties_ ([#549], [#554] via [#599]) * Support for expressing BOM distribution constraints with the _Traffic Light Protocol_ (TLP) in metadata ([#595] via [#604], [#653]) * Support for representing _patent information_ ([#596] via [#597]) * Support for _properties_ on external-references ([#608] via [#610]) * Support for _citations_ ([#630] via [#629]) * Support for detailing _cryptographic transparency_ information - _CBOM_ ([#569] via [#657]) ## Documentation * Elaborated component classification "platform", explicitly expressed that it includes just-in-time compilers and interpreters ([#233] via [#647]) * Removed the term "optional" from the schema where the definition was already unambiguous ([#616], [#649] via [#680]) ## Test data * Add test data for CycloneDX 1.7 implementations in XML, JSON, Protobuf [#233]: #233 [#321]: #321 [#454]: #454 [#485]: #485 [#525]: #525 [#549]: #549 [#554]: #554 [#569]: #569 [#582]: #582 [#586]: #586 [#595]: #595 [#596]: #596 [#597]: #597 [#599]: #599 [#600]: #600 [#601]: #601 [#604]: #604 [#608]: #608 [#610]: #610 [#616]: #616 [#629]: #629 [#630]: #630 [#647]: #647 [#649]: #649 [#653]: #653 [#657]: #657 [#680]: #680 [a973a6b]: a973a6b ---- - fixes #233 - fixes #321 - fixes #454 - fixes #485 - fixes #549 - fixes #554 - fixes #595 - fixes #596 - fixes #600 - fixes #608 - fixes #629 - fixes #616 - fixes #649
2 parents 5c0902a + 8a89e2c commit 11c0e00

File tree

272 files changed

+40357
-17
lines changed

Some content is hidden

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

272 files changed

+40357
-17
lines changed

‎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>

0 commit comments

Comments
 (0)