Skip to content

[WIP] v1.7 #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 68 commits into
base: master
Choose a base branch
from
Draft

[WIP] v1.7 #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
9b8323e
creating 1.7 from 1.6. Updating doc generation and templates.
stevespringett Aug 31, 2024
cf2ad78
Merge branch 'master' into 1.7-dev
jkowalleck Sep 2, 2024
6166a17
Merge branch 'master' into 1.7-dev
jkowalleck Sep 4, 2024
7cc2dee
carry over of latest master
jkowalleck Sep 4, 2024
ae1b41c
Merge branch 'master' into 1.7-dev
jkowalleck Sep 4, 2024
efc7163
carry over of latest master
jkowalleck Sep 4, 2024
0cc2e3a
Added support for STREEBOG-256 and STREEBOG-512 hashing algorithms (#…
volkdm Sep 26, 2024
1d0a1d5
Add "HASH_ALG_" prefix to algorithm name
volkdm Sep 26, 2024
fec8c4c
Fix hashing algorithm name, because Streebog is not an abbreviation, …
volkdm Sep 26, 2024
d0bd373
Merge branch 'master' into 1.7-dev
jkowalleck Nov 7, 2024
08a441d
carry over from master: XML,JSON,PB
jkowalleck Nov 7, 2024
fb32c17
Merge branch 'master' into 1.7-dev
jkowalleck Nov 18, 2024
b113ce6
Merge branch 'master' into 1.7-dev
jkowalleck Dec 12, 2024
60fe7c5
Merge branch 'master' into 1.7-dev
jkowalleck Dec 12, 2024
bcea8a9
incorporate latest changes from master
jkowalleck Dec 12, 2024
77c2d0e
Merge remote-tracking branch 'origin/master' into 1.7-dev
jkowalleck Jan 8, 2025
5ac9746
Merge remote-tracking branch 'origin/master' into 1.7-dev
jkowalleck Jan 11, 2025
2eeeb2a
docs: docsgen prep for 1.7
jkowalleck Jan 11, 2025
3e624b1
Merge branch 'master' into 1.7-dev
jkowalleck Jan 11, 2025
2bcbb1c
Merge branch 'master' into 1.7-dev
jkowalleck Jan 11, 2025
a998cfc
Merge branch 'master' into 1.7-dev
jkowalleck Jan 19, 2025
63541da
tests: enable tests for 1.7
jkowalleck Jan 22, 2025
423729e
tests: copy tests from 1.6
jkowalleck Jan 22, 2025
4010887
tests: rename tests for 1.7
jkowalleck Jan 22, 2025
6262459
tests: migrate tests for 1.7
jkowalleck Jan 22, 2025
544db94
tests: testcases initial 1.7 (#583)
jkowalleck Jan 22, 2025
1572344
docs: docsgen latest first
jkowalleck Jan 22, 2025
504a69f
docs: docsgen latest first (#584)
jkowalleck Jan 22, 2025
4315e39
Merge branch 'master' into 1.7-dev
jkowalleck Feb 3, 2025
439f407
add CDX 1.7 schema to xmlcatalog
jkowalleck Feb 3, 2025
df66f06
Merge remote-tracking branch 'origin/master' into 1.7-dev
jkowalleck Feb 3, 2025
4162876
forward-port #581
jkowalleck Feb 3, 2025
76f2b2c
forward-port #581
jkowalleck Feb 3, 2025
20d766d
Merge remote-tracking branch 'origin/master' into 1.7-dev
jkowalleck Feb 5, 2025
4aef005
draft: JSON - extraneous comp and version range
jkowalleck Oct 22, 2025
a6941df
docs
jkowalleck Oct 22, 2023
7ede07a
xml
jkowalleck Oct 23, 2023
84a9783
docs
jkowalleck Jan 16, 2024
7a52828
docs
jkowalleck Jan 16, 2024
d3e0ed5
Update schema/bom-1.7.schema.json
jkowalleck Feb 5, 2025
045a6de
wip
jkowalleck Feb 5, 2025
0971f02
wip
jkowalleck Feb 5, 2025
b12bd49
wip
jkowalleck Feb 6, 2025
2c00374
wip
jkowalleck Feb 6, 2025
db0b3b8
wip
jkowalleck Feb 6, 2025
d2e3053
wip
jkowalleck Feb 6, 2025
401b245
wip
jkowalleck Feb 6, 2025
65ec962
wip
jkowalleck Feb 6, 2025
959a82c
wip
jkowalleck Feb 6, 2025
e7d714f
wip
jkowalleck Feb 6, 2025
36dc8f6
Merge branch 'master' into 1.7-dev
jkowalleck Feb 6, 2025
03f20f0
Merge branch '1.7-dev' into feat/extraneous-component
jkowalleck Feb 6, 2025
339dec6
Merge branch '1.7-dev' into add-streebog-hashalg
jkowalleck Feb 6, 2025
a4622ea
spec: isExtraneous only for runtime-components
jkowalleck Feb 8, 2025
c34176d
rename `isExtranous `-> `isExternal` + wording
jkowalleck Feb 8, 2025
919e49f
docs for JSON schema requirements
jkowalleck Feb 8, 2025
21f8f42
component's version and versionRange exclusively
jkowalleck Feb 8, 2025
22c6e75
tests
jkowalleck Feb 8, 2025
0a978ea
Merge remote-tracking branch 'origin/master' into 1.7-dev
jkowalleck Feb 17, 2025
88de88c
tests(Java) 1.7
jkowalleck Feb 17, 2025
19e7c21
Merge branch '1.7-dev' into feat/extraneous-component
jkowalleck Feb 17, 2025
760c2db
Merge branch '1.7-dev' into add-streebog-hashalg
jkowalleck Feb 17, 2025
9f08878
Fix missing type definitions for ComponentData subelements
andreas-hilti Feb 21, 2025
a0a6f8f
Fix missing type definitions for ComponentData subelements in XML (#601)
jkowalleck Feb 22, 2025
7f73c1d
tests: revisit examples
jkowalleck Mar 6, 2025
ebe66bc
dev-docs
jkowalleck Mar 6, 2025
93c29e5
Add support for Streebog hashing algorithm (#525)
jkowalleck Mar 16, 2025
2f1fb1e
feat: support for external components with version-ranges (#586)
jkowalleck Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docgen/json/gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
set -eu

declare -a CDX_VERSIONS=(
'1.7'
'1.6'
'1.5'
'1.4'
Expand Down
3 changes: 3 additions & 0 deletions docgen/json/templates/cyclonedx/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,14 @@
v${version} (JSON)
</a>
<ul class="dropdown-menu" aria-labelledby="navbarScrollingDropdown">
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
<li><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
Expand All @@ -54,6 +56,7 @@
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
<li><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>
Expand Down
1 change: 1 addition & 0 deletions docgen/proto/gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
set -eu

declare -a CDX_VERSIONS=(
'1.7'
'1.6'
'1.5'
'1.4'
Expand Down
3 changes: 3 additions & 0 deletions docgen/proto/templates/html.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,14 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
v${version} (Protobuf)
</a>
<ul class="dropdown-menu" aria-labelledby="navbarScrollingDropdown">
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
<li><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
Expand All @@ -285,6 +287,7 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
<li><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>
Expand Down
1 change: 1 addition & 0 deletions docgen/xml/gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
set -eu

declare -a CDX_VERSIONS=(
'1.7'
'1.6'
'1.5'
'1.4'
Expand Down
3 changes: 3 additions & 0 deletions docgen/xml/xs3p.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,14 @@
<li class="dropdown">
<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>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
<li style="padding:0"><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
Expand All @@ -354,6 +356,7 @@
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
<li style="padding:0"><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>
Expand Down
Loading