Skip to content

fix spdx 2.3 schema #54603

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

Closed
xnox wants to merge 1 commit into from
Closed

fix spdx 2.3 schema #54603

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
6 changes: 5 additions & 1 deletion spdx-tools-java.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: spdx-tools-java
version: "2.0.1"
epoch: 0
epoch: 1
description: SPDX Command Line Tools using the Spdx-Java-Library
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -31,6 +31,10 @@ pipeline:
tag: v${{package.version}}
expected-commit: cccac767593012795e1d879f30ebd60e87e1fde6

- uses: patch
with:
patches: fix-operating-system.patch

- uses: ecosystems/maven

- uses: maven/pombump
Expand Down
17 changes: 17 additions & 0 deletions spdx-tools-java/fix-operating-system.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Description: avoid breaking change by accepting the current upstream
value with underscore, and the value specified in the spec with a dash
Upstream: https://github.com/spdx/tools-java/pull/211

diff --git a/resources/spdx-schema-v2.3.json b/resources/spdx-schema-v2.3.json
index 403d202..36c955a 100644
--- a/resources/spdx-schema-v2.3.json
+++ b/resources/spdx-schema-v2.3.json
@@ -413,7 +413,7 @@
"primaryPackagePurpose" : {
"description" : "This field provides information about the primary purpose of the identified package. Package Purpose is intrinsic to how the package is being used rather than the content of the package.",
"type" : "string",
- "enum" : [ "OTHER", "INSTALL", "ARCHIVE", "FIRMWARE", "APPLICATION", "FRAMEWORK", "LIBRARY", "CONTAINER", "SOURCE", "DEVICE", "OPERATING_SYSTEM", "FILE" ]
+ "enum" : [ "OTHER", "INSTALL", "ARCHIVE", "FIRMWARE", "APPLICATION", "FRAMEWORK", "LIBRARY", "CONTAINER", "SOURCE", "DEVICE", "OPERATING_SYSTEM", "OPERATING-SYSTEM", "FILE" ]
},
"releaseDate" : {
"description" : "This field provides a place for recording the date the package was released.",
Loading