[WIP] CycloneDX v2.0 Specification - #652
Draft
stevespringett wants to merge 158 commits into
Draft
Conversation
Signed-off-by: Steve Springett <steve@springett.us>
Open
jkowalleck
changed the title
Syncing with master to incoporate v1.7 spec
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
This reverts commit bde33b2.
Signed-off-by: Steve Springett <steve@springett.us>
Signed-off-by: Steve Springett <steve@springett.us>
Signed-off-by: Steve Springett <steve@springett.us>
Signed-off-by: Steve Springett <steve@springett.us>
Signed-off-by: Steve Springett <steve@springett.us>
Signed-off-by: Steve Springett <steve@springett.us>
Signed-off-by: Steve Springett <steve@springett.us>
Signed-off-by: Steve Springett <steve@springett.us>
Signed-off-by: Steve Springett <steve@springett.us>
Signed-off-by: Steve Springett <steve@springett.us>
Signed-off-by: Steve Springett <steve@springett.us>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
test scripts were split between CycloneDX v1.x and v2.x (v2 tests do not exist, yet) --------- Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
This comment was marked as outdated.
This comment was marked as outdated.
- [x] Java tests - functional - [x] JS tests - functional - WIP - found some false-positives/false-negatives - due to errors in test resources - [x] JS tests - schema validate - includes #996 - includes #992 - JS tests - semantics - [x] #998 - [x] #995 - [x] PHP tests - functional added tests only, no schema/res fixes - they are prepared in - #997 - #1001 --------- Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
merge latest master and fix conflicts caused by #652 (comment) ---- there are currently some conflicts in the `.github/workflows/*` ```text This branch has conflicts that must be resolved Use the command line to resolve conflicts before continuing. .github/workflows/bundle_2.0_schemas.yml .github/workflows/test_java.yml .github/workflows/test_js.yml .github/workflows/test_php.yml .github/workflows/test_proto.yml docgen/json/templates/cyclonedx/base.html docgen/json/templates/cyclonedx/section_properties.html docgen/proto/templates/html.tmpl docgen/xml/xs3p.xsl tools/src/test/js/json-schema-functional-tests.js tools/src/test/js/json-schema-lint-tests.js ``` i will sort this out soon. basically this is a file being moved in our(`2.0-dev`) branch, and a dependabot updating an action in their's(`master`) branch. similar with tests and QA tools ... but i have no idea what to do with the docs - i guess we use "ours"? --------- Signed-off-by: wievdndr <wiebe.vandendriessche@ugent.be> Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> Signed-off-by: Basil Hess <bhe@zurich.ibm.com> Signed-off-by: Mehrn0ush <mehrnoush.vaseghi@gmail.com> Signed-off-by: Steve Springett <steve@springett.us> Signed-off-by: Joachim Vandersmissen <git@jvdsn.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: wievdndr <wiebe.vandendriessche@ugent.be> Co-authored-by: Wiebe Vandendriessche <146532897+wiebe-vandendriessche@users.noreply.github.com> Co-authored-by: Basil Hess <bhe@zurich.ibm.com> Co-authored-by: Mehrn0ush <mehrnoush.vaseghi@gmail.com> Co-authored-by: Steve Springett <steve@springett.us> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Joachim Vandersmissen <git@jvdsn.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
fix mergeconflicts
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
schema tests: every enum value is present in (optional) `meta:enum`
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Important
WORK IN PROGRESS
see Milestone for progress: https://github.com/CycloneDX/specification/milestone/2
BREAKING Changes
To be explained further.
Reasoning: Downstream spec users may build ontop of JSON schema.
To be explained further.
... TBC ...
Added
... TBD ...
Chaned
... TBD ...
Removed
... TBD ...
Misc
... TBD ...