-
-
Notifications
You must be signed in to change notification settings - Fork 79
[WIP] CycloneDX v2.0 Specification #652
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.
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
stevespringett
wants to merge
66
commits into
master
Choose a base branch
from
2.0-dev
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+18,069
−11
Draft
Changes from 3 commits
Commits
Show all changes
66 commits
Select commit
Hold shift + click to select a range
eac0ac6
Initial commit
stevespringett 028c9df
Merge remote-tracking branch 'origin/master' into 2.0-dev
stevespringett bde33b2
Syncing with master
stevespringett dae213a
Revert "Syncing with master"
stevespringett fbaf3de
Added schema bundler and updated readme.
stevespringett 0d74d96
Adding GitHub Action to combine schemas
stevespringett 51fbf49
Updated branches
stevespringett b4721e1
Updating action
stevespringett 91ec8e0
chore: update bundled schema [skip ci]
github-actions[bot] c4d6c82
Updated docgen for 2.0
stevespringett b6fed22
Added minified bundling
stevespringett 173a276
chore: update bundled schemas [skip ci]
github-actions[bot] 0427839
Added further optimization to minified version
stevespringett 8668856
chore: update bundled schemas [skip ci]
github-actions[bot] c46624c
Fixed resolution issues
stevespringett ed3eb38
chore: update bundled schemas [skip ci]
github-actions[bot] 7aceff4
Added ref verification
stevespringett 70ea2fa
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
stevespringett dd45ceb
Updated JSON Schema for Humans
stevespringett b8abb0c
Initial commit of CycloneDX linter
stevespringett f0c447b
Moved bundler
stevespringett 41ad354
Added lock file
stevespringett 319ed73
Omitting a few properties from being bundled.
stevespringett 47f0ec2
chore: update bundled schemas [skip ci]
github-actions[bot] f0fcf97
Added comment check
stevespringett 625b757
Added schema version check
stevespringett 90de7cd
Ported metadata minus deprecations.
stevespringett 38547b6
Ported multiple models minus deprecations and standardized id and com…
stevespringett 9be3484
Ported model card
stevespringett 4e77988
Updating indent check. Added two new checks.
stevespringett 08e4936
Updating readme
stevespringett 666b40d
Updating readme
stevespringett 7f3c089
Ported dependency and composition objects
stevespringett 4456b54
Updated title
stevespringett ce23470
chore: update bundled schemas [skip ci]
github-actions[bot] 0f9f07f
Ported vulnerability model
stevespringett 17daf80
chore: update bundled schemas [skip ci]
github-actions[bot] 976a9d2
Ported annotation model
stevespringett 80cf0cc
chore: update bundled schemas [skip ci]
github-actions[bot] 8237c95
Ported formulation model
stevespringett 98a2ce7
chore: update bundled schemas [skip ci]
github-actions[bot] c1c1e03
Ported declaration model
stevespringett 9575876
chore: update bundled schemas [skip ci]
github-actions[bot] 37e04be
Ported definition and standard model. Updated patent model.
stevespringett f2e7bb2
chore: update bundled schemas [skip ci]
github-actions[bot] cbba940
Ported citation model.
stevespringett 9a09935
Added remaining root objects.
stevespringett 43945b5
chore: update bundled schemas [skip ci]
github-actions[bot] 93f57a5
Removed properties from license. Removed unused model files.
stevespringett 1caff3e
chore: update bundled schemas [skip ci]
github-actions[bot] 5012f06
Removed extensible properties to root object.
stevespringett 66cd80e
chore: update bundled schemas [skip ci]
github-actions[bot] c23f59b
Ported service model.
stevespringett 691bc49
chore: update bundled schemas [skip ci]
github-actions[bot] 2d9b07a
Fixed extensibleProperties defect preventing validation
stevespringett 7ddf4b8
chore: update bundled schemas [skip ci]
github-actions[bot] da1b173
Fixed properties defect.
stevespringett dde65f3
chore: update bundled schemas [skip ci]
github-actions[bot] 57beb2e
Synced external references with 1.7 version
stevespringett 2114c27
chore: update bundled schemas [skip ci]
github-actions[bot] 5f14c2a
Fixed property issue with component
stevespringett 9f13aae
chore: update bundled schemas [skip ci]
github-actions[bot] 3a80369
Fixed composition model
stevespringett 0d619e3
chore: update bundled schemas [skip ci]
github-actions[bot] 75c344d
Synced hash with v1.7 version
stevespringett 8db8674
chore: update bundled schemas [skip ci]
github-actions[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| name: Bundle JSON Schema with Versioned Output | ||
|
|
||
| on: | ||
| push: | ||
| paths: | ||
| - 'schemas/**' | ||
| - '.github/workflows/bundle-schema.yml' | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| bundle-schema: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Set up Node.js | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: 20 | ||
|
|
||
| - name: Install AJV CLI | ||
| run: npm install -g ajv-cli | ||
|
|
||
| - name: Extract Version and Bundle Schema | ||
| run: | | ||
| VERSION=$(basename schemas/cyclonedx-bom-*.schema.json | sed -E 's/bom-([0-9]+\.[0-9]+)\.schema\.json/\1/') | ||
| echo "Detected version: $VERSION" | ||
| mkdir -p dist | ||
| ajv compile \ | ||
| -s schemas/cyclonedx-bom-$VERSION.schema.json \ | ||
| -r schemas/cyclonedx-metadata-$VERSION.schema.json \ | ||
| -o dist/cyclonedx-bom-combined-$VERSION.schema.json \ | ||
| --strict=false | ||
| - name: Upload Combined Schema | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: bundled-schema | ||
| path: dist/bom-*-combined.schema.json | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project> | ||
| <meta> | ||
| <filters directoryPatterns="" filePatterns="\QCycloneDX Specifiation.xpr\E" positiveFilePatterns="" showHiddenFiles="false"/> | ||
| <options/> | ||
| </meta> | ||
| <projectTree name="CycloneDX%20Specifiation.xpr"> | ||
| <folder path="."/> | ||
| </projectTree> | ||
| </project> |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.