Skip to content
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

Jump to bottom

Upgrade SPDX output to specification version 2.3 #7839

Closed
wants to merge 1 commit into from
Closed

Upgrade SPDX output to specification version 2.3 #7839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ following formats are supported (reporter names are case-insensitive):
* Customizable with [Apache Freemarker](https://freemarker.apache.org/) templates
* Opossum input that can be visualized and edited in the [OpossumUI](https://github.com/opossum-tool/opossumUI)
(`-f Opossum`)
* [SPDX Document](https://spdx.dev/specifications/), version 2.2 (`-f SpdxDocument`)
* [SPDX Document](https://spdx.dev/specifications/), version 2.3 (`-f SpdxDocument`)
* Static HTML (`-f StaticHtml`)
* [TrustSource](https://www.trustsource.io/) JSON file (`-f TrustSource`)
* Use this as an alternative to [ts-scan](https://github.com/TrustSource/ts-scan) for support of more build systems.
Expand Down
20 changes: 10 additions & 10 deletions plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SPDXID" : "SPDXRef-DOCUMENT",
"spdxVersion" : "SPDX-2.2",
"spdxVersion" : "SPDX-2.3",
"creationInfo" : {
"comment" : "some creation info comment",
"created" : "<REPLACE_CREATION_DATE_AND_TIME>",
Expand Down Expand Up @@ -39,7 +39,7 @@
"copyrightText" : "Copyright 2020 Some copyright holder in VCS\nCopyright 2020 Some copyright holder in source artifact\nCopyright 2020 Some other copyright holder in source artifact",
"downloadLocation" : "https://some-host/first-package.jar",
"externalRefs" : [ {
"referenceCategory" : "PACKAGE_MANAGER",
"referenceCategory" : "PACKAGE-MANAGER",
"referenceType" : "purl",
"referenceLocator" : "pkg:maven/first-package-group/first-package@0.0.1"
} ],
Expand All @@ -55,7 +55,7 @@
"copyrightText" : "Copyright 2020 Some copyright holder in VCS\nCopyright 2020 Some copyright holder in source artifact\nCopyright 2020 Some other copyright holder in source artifact",
"downloadLocation" : "git+ssh://github.com/path/first-package-repo.git@deadbeef#project-path",
"externalRefs" : [ {
"referenceCategory" : "PACKAGE_MANAGER",
"referenceCategory" : "PACKAGE-MANAGER",
"referenceType" : "purl",
"referenceLocator" : "pkg:maven/first-package-group/first-package@0.0.1"
} ],
Expand All @@ -80,7 +80,7 @@
"copyrightText" : "Copyright 2020 Some copyright holder in VCS\nCopyright 2020 Some copyright holder in source artifact\nCopyright 2020 Some other copyright holder in source artifact",
"downloadLocation" : "https://some-host/first-package-sources.jar",
"externalRefs" : [ {
"referenceCategory" : "PACKAGE_MANAGER",
"referenceCategory" : "PACKAGE-MANAGER",
"referenceType" : "purl",
"referenceLocator" : "pkg:maven/first-package-group/first-package@0.0.1"
} ],
Expand All @@ -96,7 +96,7 @@
"copyrightText" : "NONE",
"downloadLocation" : "NONE",
"externalRefs" : [ {
"referenceCategory" : "PACKAGE_MANAGER",
"referenceCategory" : "PACKAGE-MANAGER",
"referenceType" : "purl",
"referenceLocator" : "pkg:maven/fourth-package-group/fourth-package@0.0.1"
} ],
Expand All @@ -112,7 +112,7 @@
"copyrightText" : "NONE",
"downloadLocation" : "NONE",
"externalRefs" : [ {
"referenceCategory" : "PACKAGE_MANAGER",
"referenceCategory" : "PACKAGE-MANAGER",
"referenceType" : "purl",
"referenceLocator" : "pkg:maven/second-package-group/second-package@0.0.1"
} ],
Expand All @@ -128,7 +128,7 @@
"copyrightText" : "Copyright 2020 Some copyright holder in source artifact",
"downloadLocation" : "NONE",
"externalRefs" : [ {
"referenceCategory" : "PACKAGE_MANAGER",
"referenceCategory" : "PACKAGE-MANAGER",
"referenceType" : "purl",
"referenceLocator" : "pkg:maven/seventh-package-group/seventh-package@0.0.1"
} ],
Expand All @@ -148,7 +148,7 @@
"copyrightText" : "Copyright 2020 Some copyright holder in source artifact",
"downloadLocation" : "https://some-host/seventh-package-sources.jar",
"externalRefs" : [ {
"referenceCategory" : "PACKAGE_MANAGER",
"referenceCategory" : "PACKAGE-MANAGER",
"referenceType" : "purl",
"referenceLocator" : "pkg:maven/seventh-package-group/seventh-package@0.0.1"
} ],
Expand All @@ -169,7 +169,7 @@
"copyrightText" : "NONE",
"downloadLocation" : "NONE",
"externalRefs" : [ {
"referenceCategory" : "PACKAGE_MANAGER",
"referenceCategory" : "PACKAGE-MANAGER",
"referenceType" : "purl",
"referenceLocator" : "pkg:maven/sixth-package-group/sixth-package@0.0.1"
} ],
Expand All @@ -185,7 +185,7 @@
"copyrightText" : "NONE",
"downloadLocation" : "NONE",
"externalRefs" : [ {
"referenceCategory" : "PACKAGE_MANAGER",
"referenceCategory" : "PACKAGE-MANAGER",
"referenceType" : "purl",
"referenceLocator" : "pkg:maven/third-package-group/third-package@0.0.1"
} ],
Expand Down
20 changes: 10 additions & 10 deletions plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
SPDXID: "SPDXRef-DOCUMENT"
spdxVersion: "SPDX-2.2"
spdxVersion: "SPDX-2.3"
creationInfo:
comment: "some creation info comment"
created: "<REPLACE_CREATION_DATE_AND_TIME>"
Expand Down Expand Up @@ -49,7 +49,7 @@ packages:
\ in source artifact"
downloadLocation: "https://some-host/first-package.jar"
externalRefs:
- referenceCategory: "PACKAGE_MANAGER"
- referenceCategory: "PACKAGE-MANAGER"
referenceType: "purl"
referenceLocator: "pkg:maven/first-package-group/first-package@0.0.1"
filesAnalyzed: false
Expand All @@ -67,7 +67,7 @@ packages:
\ in source artifact"
downloadLocation: "git+ssh://github.com/path/first-package-repo.git@deadbeef#project-path"
externalRefs:
- referenceCategory: "PACKAGE_MANAGER"
- referenceCategory: "PACKAGE-MANAGER"
referenceType: "purl"
referenceLocator: "pkg:maven/first-package-group/first-package@0.0.1"
filesAnalyzed: true
Expand Down Expand Up @@ -95,7 +95,7 @@ packages:
\ in source artifact"
downloadLocation: "https://some-host/first-package-sources.jar"
externalRefs:
- referenceCategory: "PACKAGE_MANAGER"
- referenceCategory: "PACKAGE-MANAGER"
referenceType: "purl"
referenceLocator: "pkg:maven/first-package-group/first-package@0.0.1"
filesAnalyzed: false
Expand All @@ -111,7 +111,7 @@ packages:
copyrightText: "NONE"
downloadLocation: "NONE"
externalRefs:
- referenceCategory: "PACKAGE_MANAGER"
- referenceCategory: "PACKAGE-MANAGER"
referenceType: "purl"
referenceLocator: "pkg:maven/fourth-package-group/fourth-package@0.0.1"
filesAnalyzed: false
Expand All @@ -125,7 +125,7 @@ packages:
copyrightText: "NONE"
downloadLocation: "NONE"
externalRefs:
- referenceCategory: "PACKAGE_MANAGER"
- referenceCategory: "PACKAGE-MANAGER"
referenceType: "purl"
referenceLocator: "pkg:maven/second-package-group/second-package@0.0.1"
filesAnalyzed: false
Expand All @@ -139,7 +139,7 @@ packages:
copyrightText: "Copyright 2020 Some copyright holder in source artifact"
downloadLocation: "NONE"
externalRefs:
- referenceCategory: "PACKAGE_MANAGER"
- referenceCategory: "PACKAGE-MANAGER"
referenceType: "purl"
referenceLocator: "pkg:maven/seventh-package-group/seventh-package@0.0.1"
filesAnalyzed: false
Expand All @@ -156,7 +156,7 @@ packages:
copyrightText: "Copyright 2020 Some copyright holder in source artifact"
downloadLocation: "https://some-host/seventh-package-sources.jar"
externalRefs:
- referenceCategory: "PACKAGE_MANAGER"
- referenceCategory: "PACKAGE-MANAGER"
referenceType: "purl"
referenceLocator: "pkg:maven/seventh-package-group/seventh-package@0.0.1"
filesAnalyzed: true
Expand All @@ -177,7 +177,7 @@ packages:
copyrightText: "NONE"
downloadLocation: "NONE"
externalRefs:
- referenceCategory: "PACKAGE_MANAGER"
- referenceCategory: "PACKAGE-MANAGER"
referenceType: "purl"
referenceLocator: "pkg:maven/sixth-package-group/sixth-package@0.0.1"
filesAnalyzed: false
Expand All @@ -191,7 +191,7 @@ packages:
copyrightText: "NONE"
downloadLocation: "NONE"
externalRefs:
- referenceCategory: "PACKAGE_MANAGER"
- referenceCategory: "PACKAGE-MANAGER"
referenceType: "purl"
referenceLocator: "pkg:maven/third-package-group/third-package@0.0.1"
filesAnalyzed: false
Expand Down
Loading