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

Adding Metadata:Manufacture and Licenses #310

Merged
merged 7 commits into from
Oct 17, 2023

Conversation

flashfishgit
Copy link
Contributor

Hello,
I noticed there is no way to include Manufacture and Licenses in the Metadata. (https://cyclonedx.org/docs/1.4/json/#metadata.)

This pull-request adds a way to manually include these information, by passing the from the build.gradle

I also added two Tests and included my Documentation in the Read.me File.

Copy link
Member

@glefloch glefloch 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 this work @flashfishgit, I think we can improve the user experience by adding some custom DSL into the task.

src/main/java/org/cyclonedx/gradle/CycloneDxTask.java Outdated Show resolved Hide resolved
src/main/java/org/cyclonedx/gradle/CycloneDxTask.java Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
src/main/java/org/cyclonedx/gradle/CycloneDxTask.java Outdated Show resolved Hide resolved
src/main/java/org/cyclonedx/gradle/CycloneDxTask.java Outdated Show resolved Hide resolved
src/main/java/org/cyclonedx/gradle/CycloneDxTask.java Outdated Show resolved Hide resolved
src/main/java/org/cyclonedx/gradle/CycloneDxTask.java Outdated Show resolved Hide resolved
src/main/java/org/cyclonedx/gradle/CycloneDxTask.java Outdated Show resolved Hide resolved
src/main/java/org/cyclonedx/gradle/CycloneDxTask.java Outdated Show resolved Hide resolved
@sonatype-lift
Copy link

sonatype-lift bot commented Jun 22, 2023

🛠 Lift Auto-fix

Some of the Lift findings in this PR can be automatically fixed. You can download and apply these changes in your local project directory of your branch to review the suggestions before committing.1

# Download the patch
curl https://lift.sonatype.com/api/patch/github.com/CycloneDX/cyclonedx-gradle-plugin/310.diff -o lift-autofixes.diff

# Apply the patch with git
git apply lift-autofixes.diff

# Review the changes
git diff

Want it all in a single command? Open a terminal in your project's directory and copy and paste the following command:

curl https://lift.sonatype.com/api/patch/github.com/CycloneDX/cyclonedx-gradle-plugin/310.diff | git apply

Once you're satisfied, commit and push your changes in your project.

Footnotes

  1. You can preview the patch by opening the patch URL in the browser.

@flashfishgit
Copy link
Contributor Author

Thanks for your fast response.
Here is my update with the recommended changes.

README.md Show resolved Hide resolved
Copy link
Member

@glefloch glefloch left a comment

Choose a reason for hiding this comment

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

It looks good to me. Could you fix conflicts ?

README.md Show resolved Hide resolved
@oliva123456
Copy link

hello @glefloch ,
would be glad about the described changes. is it possible to finish the review / merge-request?
thanks in advance and lots of greets,
Oliver

mso and others added 7 commits October 17, 2023 21:00
Signed-off-by: mso <mso@sbs.co.at>
Signed-off-by: mso <mso@sbs.co.at>
remove //

Signed-off-by: mso <mso@sbs.co.at>
Signed-off-by: Author Name <marco.soellinger@gmx.at>
Signed-off-by: mso <mso@sbs.co.at>
Signed-off-by: Author Name <marco.soellinger@gmx.at>
Signed-off-by: mso <mso@sbs.co.at>
@glefloch
Copy link
Member

@flashfishgit I rebased your work locally but I'm not able to push my updates. Could you check the box allowing me to update your branch ? This should be located in the pull request settings.

@glefloch
Copy link
Member

Actually it's ok. I was able to push my rebase.

@glefloch glefloch merged commit 0d298e4 into CycloneDX:master Oct 17, 2023
4 of 9 checks passed
@glefloch
Copy link
Member

thanks for this work @flashfishgit

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 31, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants