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

Add CycloneDX metadata #7405

Merged
merged 4 commits into from
Aug 24, 2023
Merged

Add CycloneDX metadata #7405

merged 4 commits into from
Aug 24, 2023

Conversation

sschuberth
Copy link
Member

Please have a look at the individual commit messages for the details.

@sschuberth sschuberth requested a review from a team as a code owner August 22, 2023 15:13
@sschuberth sschuberth enabled auto-merge (rebase) August 22, 2023 15:13
@codecov
Copy link

codecov bot commented Aug 22, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.01% ⚠️

Comparison is base (abd202c) 60.91% compared to head (3758b59) 60.91%.

❗ Current head 3758b59 differs from pull request most recent head 59d1c2c. Consider uploading reports for the commit 59d1c2c to get more accurate results

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #7405      +/-   ##
============================================
- Coverage     60.91%   60.91%   -0.01%     
  Complexity     1968     1968              
============================================
  Files           338      338              
  Lines         16622    16623       +1     
  Branches       2365     2365              
============================================
  Hits          10126    10126              
- Misses         5518     5519       +1     
  Partials        978      978              
Flag Coverage Δ
funTest-non-docker 29.50% <ø> (ø)
test 36.45% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
utils/spdx/src/main/kotlin/model/SpdxDocument.kt 65.38% <0.00%> (-1.29%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -25,10 +25,12 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize

import org.ossreviewtoolkit.utils.common.getDuplicates
import org.ossreviewtoolkit.utils.spdx.SpdxConstants.REF_PREFIX
import org.ossreviewtoolkit.utils.spdx.SpdxLicense
Copy link
Member

Choose a reason for hiding this comment

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

Commit message nit: "a hard-coded"

To avoid replacing unintended strings, replace only the first occurrence
in the header section before the components start. This is a preparation
for adding more replacements.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
This increases the score with tools like sbomqs [1]. Also see [2].

[1]: https://github.com/interlynk-io/sbomqs
[2]: interlynk-io/sbombenchmark.dev#11

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
By default, use CC0-1.0 as the license, just like for SPDX data.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Avoid typos and ease refactoring by using the appropriate `enum` value
for the license ID instead of a hard-coded string.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
@sschuberth sschuberth merged commit fea496e into main Aug 24, 2023
19 of 21 checks passed
@sschuberth sschuberth deleted the cdx-metadata branch August 24, 2023 12:38
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.

2 participants