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.

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

Jump to bottom

code cleanup: move parameter to aggregate, simplify code #249

Merged
merged 1 commit into from
Jan 1, 2023
Merged

code cleanup: move parameter to aggregate, simplify code #249

merged 1 commit into from
Jan 1, 2023

Conversation

hboutemy
Copy link
Contributor

No description provided.

stevespringett
stevespringett requested changes Dec 28, 2022
View reviewed changes
Copy link
Member

@stevespringett stevespringett left a comment

Choose a reason for hiding this comment

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

Thanks for the cleanup. Looks good. Just a few minor changes requested.

src/main/java/org/cyclonedx/maven/BaseCycloneDxMojo.java
* Excluded ArtifactIds.
*/
@Parameter(property = "excludeArtifactId", required = false)
protected String[] excludeArtifactId;
Copy link
Member

Choose a reason for hiding this comment

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

This should continue to be in BaseCycloneDxMojo. Both makeBom and makeAggregateBom should account for exclusions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it currently is not taken into account in makeBom, or the refactoring would not have been ok: IIUC, this means there is a bug in makeBom, that will require another fix.
I'll revert that part of the refactoring in the current PR, and open another bugfix PR for taking the config into account into makeBom

src/main/java/org/cyclonedx/maven/BaseCycloneDxMojo.java Show resolved Hide resolved
@hboutemy
Copy link
Contributor Author

on excludeGroupId and excludeArtifactId, I reverted the refactoring as requested and starting investigation.

First finding: the feature was added in #91 with excludeArtifactId and excludeTestProject and completed with excludeGroupId in #218 with documentation in README focusing on makeAggregateBom

If we extend the usage, we'll need to update documentation...

@hboutemy
code cleanup: move parameter to aggregate, simplify code
cb36817 
Signed-off-by: Hervé Boutemy <hboutemy@apache.org>
@stevespringett
Copy link
Member

Big thanks @hboutemy

@stevespringett stevespringett merged commit 274f65c into CycloneDX:master Jan 1, 2023
@hboutemy hboutemy deleted the cleanup branch January 1, 2023 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sonatype-lift sonatype-lift[bot] sonatype-lift left review comments

@stevespringett stevespringett stevespringett requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@hboutemy @stevespringett