Fix support for CycloneDX 1.5 #362
Merged
Conversation
This file contains 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
Fix bug causing the CycloneDX 1.5 schema version to be ignored by the plugin with fallback to 1.4. Update docs with spec references to version 1.5. Fixes gh-361 Signed-off-by: Thomas Vitale <ThomasVitale@users.noreply.github.com>
ThomasVitale
commented
Nov 5, 2023
| @@ -4,6 +4,8 @@ | |||
|
|
|||
| public class CycloneDxUtils { | |||
|
|
|||
| public static final CycloneDxSchema.Version DEFAULT_SCHEMA_VERSION = CycloneDxSchema.Version.VERSION_15; | |||
There was a problem hiding this comment.
Centralising the default version here should reduce the likelihood to change the default version in the Task property without also updating this util class, preventing the current bug to happen again.
It's also possible to configure the default directly to CycloneDxSchema.VERSION_LATEST, but it would be less obvious which version is that just by reading the code, so I opted for a more explicit configuration. Thoughts?
Fixes gh-361 Signed-off-by: Thomas Vitale <ThomasVitale@users.noreply.github.com>
|
It looks like I missed a couple of tests to update to check against the default version rather than hard-coded 1.4. I'm about to push the missing change. |
glefloch
approved these changes
Nov 6, 2023
|
Thanks @ThomasVitale! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix bug causing the CycloneDX 1.5 schema version
to be ignored by the plugin with fallback to 1.4.
Update docs with spec references to version 1.5.
Fixes gh-361