Skip to content

Commit b399c0d

Browse files
authored
feat: basic support cdx17 (#579)
reworked internal design to automatically support any defined SpecVersion --------- Signed-off-by: Jan Kowalleck <[email protected]>
1 parent 4cf719f commit b399c0d

File tree

21 files changed

+9998
-89
lines changed

21 files changed

+9998
-89
lines changed

HISTORY.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
66

77
<!-- add unreleased items here -->
88

9+
Added _basic_ support for [_CycloneDX_ Specification-1.7](https://github.com/CycloneDX/specification/releases/tag/1.7).
10+
11+
* Changed
12+
* This tool may support _CycloneDX_ Specification-1.7 now (via [#579])
13+
This feature depends on `cyclonedx/cyclonedx-library:^3.8`.
14+
15+
[#579]: https://github.com/CycloneDX/cyclonedx-php-composer/pull/579
16+
917
## 5.2.3 - 2025-05-12
1018

1119
Maintenance release.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Options:
7474
{choices: "dev", "plugin"}
7575
(multiple values allowed)
7676
--spec-version=SPEC-VERSION Which version of CycloneDX spec to use.
77-
{choices: "1.1", "1.2", "1.3", "1.4", "1.5", "1.6"}
77+
{choices: "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7"}
7878
[default: "1.5"]
7979
--output-reproducible|--no-output-reproducible Whether to go the extra mile and make the output reproducible.
8080
This might result in loss of time- and random-based-values.

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
},
5656
"config": {
5757
"allow-plugins": {
58+
"cyclonedx/cyclonedx-php-composer": true,
5859
"ergebnis/composer-normalize": true,
5960
"icanhazstring/composer-unused": true
6061
},

demo/devReq/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ The following are examples generated by _cyclonedx-php-composer_:
1414
* [`results/bom.1.3.xml`](results/bom.1.3.xml)
1515
* [`results/bom.1.4.xml`](results/bom.1.4.xml)
1616
* [`results/bom.1.5.xml`](results/bom.1.5.xml)
17+
* [`results/bom.1.6.xml`](results/bom.1.6.xml)
18+
* [`results/bom.1.7.xml`](results/bom.1.7.xml)
1719
* [`results/bom.1.2.json`](results/bom.1.2.json)
1820
* [`results/bom.1.3.json`](results/bom.1.3.json)
1921
* [`results/bom.1.4.json`](results/bom.1.4.json)
2022
* [`results/bom.1.5.json`](results/bom.1.5.json)
23+
* [`results/bom.1.6.json`](results/bom.1.6.json)
24+
* [`results/bom.1.7.json`](results/bom.1.7.json)
2125

2226
## Setup
2327

demo/devReq/project/composer.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"@putenv CDX_CP_TOOLS_VERSION_OVERRIDE=in-dev",
4040
"@putenv CDX_CP_TOOLS_EXCLUDE_LIBS=1",
4141
"@putenv CDX_CP_TOOLS_EXCLUDE_COMPOSER=1",
42+
"@composer -d ../../.tool CycloneDX:make-sbom --validate --spec-version=1.7 --output-reproducible --output-format=JSON --output-file=$PWD/../results/bom.1.7.json $PWD/composer.json",
4243
"@composer -d ../../.tool CycloneDX:make-sbom --validate --spec-version=1.6 --output-reproducible --output-format=JSON --output-file=$PWD/../results/bom.1.6.json $PWD/composer.json",
4344
"@composer -d ../../.tool CycloneDX:make-sbom --validate --spec-version=1.5 --output-reproducible --output-format=JSON --output-file=$PWD/../results/bom.1.5.json $PWD/composer.json",
4445
"@composer -d ../../.tool CycloneDX:make-sbom --validate --spec-version=1.4 --output-reproducible --output-format=JSON --output-file=$PWD/../results/bom.1.4.json $PWD/composer.json",
@@ -49,6 +50,7 @@
4950
"@putenv CDX_CP_TOOLS_VERSION_OVERRIDE=in-dev",
5051
"@putenv CDX_CP_TOOLS_EXCLUDE_LIBS=1",
5152
"@putenv CDX_CP_TOOLS_EXCLUDE_COMPOSER=1",
53+
"@composer -d ../../.tool CycloneDX:make-sbom --validate --spec-version=1.7 --output-reproducible --output-format=XML --output-file=$PWD/../results/bom.1.7.xml $PWD/composer.json",
5254
"@composer -d ../../.tool CycloneDX:make-sbom --validate --spec-version=1.6 --output-reproducible --output-format=XML --output-file=$PWD/../results/bom.1.6.xml $PWD/composer.json",
5355
"@composer -d ../../.tool CycloneDX:make-sbom --validate --spec-version=1.5 --output-reproducible --output-format=XML --output-file=$PWD/../results/bom.1.5.xml $PWD/composer.json",
5456
"@composer -d ../../.tool CycloneDX:make-sbom --validate --spec-version=1.4 --output-reproducible --output-format=XML --output-file=$PWD/../results/bom.1.4.xml $PWD/composer.json",

0 commit comments

Comments
 (0)