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.

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

Support 1.6 spec #556

Merged
merged 1 commit into from
Oct 5, 2024
Merged

Conversation

thesurlydev
Copy link

This PR adds support for the 1.6 specification. Closes issue #489

@@ -80,7 +80,7 @@ public abstract class BaseCycloneDxMojo extends AbstractMojo {
*
* @since 2.1.0
*/
@Parameter(property = "schemaVersion", defaultValue = "1.6", required = false)
@Parameter(property = "schemaVersion", defaultValue = "1.5", required = false)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

until now, default schema version was latest supported: why doing that? is really consistency with Gradle plugin a good reason?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@msymons WDYT?

Copy link
Author

@thesurlydev thesurlydev Oct 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have a strong opinion but thought there might be precedence for keeping the default one version behind. Maybe this would be a good addition to the missing CONTRIBUTING.md document (#557) :)

Copy link

@VinodAnandan VinodAnandan Oct 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we can set CycloneDX 1.6 as the default in version 2.9.x. @stevespringett, what do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please drop this commit and squash the others

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no objection to updating default to 1.6. As @hboutemy observes, this maintains consistent behaviour with previous releases. The 1.6 spec was released 6 months ago. It will seem like no time at all before 1.7 is out!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed that 1.6 should be the default. Its been out long enough and is a higher-quality spec over v1.5.

@thesurlydev
Copy link
Author

@hboutemy I've made 1.6 the default and squashed the commits.

@thesurlydev
Copy link
Author

@hboutemy Can this be merged now?

@hboutemy hboutemy merged commit a86023a into CycloneDX:master Oct 5, 2024
3 checks passed
@hboutemy
Copy link
Contributor

hboutemy commented Oct 5, 2024

back home, merged: thanks a lot @thesurlydev
I let a few days for people wanting to test from source, then I'll do a release as it is from the release that most feedback will come

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants