fix(reporter): Add authors to concluded license #9600
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
This comment was marked as outdated.
This comment was marked as outdated.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #9600 +/- ##
=========================================
Coverage 68.05% 68.06%
- Complexity 1285 1298 +13
=========================================
Files 249 249
Lines 8835 8861 +26
Branches 921 926 +5
=========================================
+ Hits 6013 6031 +18
- Misses 2433 2440 +7
- Partials 389 390 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
wkl3nk
force-pushed
the
wkl3nk/add-authors-to-concluded-licenses
branch
2 times, most recently
from
75abb71 to
9d51625
Compare
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
wkl3nk
force-pushed
the
wkl3nk/add-authors-to-concluded-licenses
branch
from
9d51625 to
1a4580f
Compare
wkl3nk
force-pushed
the
wkl3nk/add-authors-to-concluded-licenses
branch
2 times, most recently
from
053ada6 to
3e6f6f4
Compare
mnonnenmacher
previously requested changes
Dec 17, 2024
There was a problem hiding this comment.
Except for the one comment this change looks good to me. @sschuberth Do you also want to have another look?
sschuberth
reviewed
Dec 17, 2024
wkl3nk
force-pushed
the
wkl3nk/add-authors-to-concluded-licenses
branch
2 times, most recently
from
875975c to
e0f75f4
Compare
sschuberth
requested changes
Dec 18, 2024
wkl3nk
force-pushed
the
wkl3nk/add-authors-to-concluded-licenses
branch
from
e0f75f4 to
46e8f36
Compare
Refactor the code to improve reusability and maintainability by extracting the functionality for resolving copyright statements from package authors into a separate function. The extracted function encapsulates the existing logic, making it easier to call from multiple places while reducing duplication. The refactor does not introduce any changes to the existing behavior and serves purely as a structural improvement. Signed-off-by: Wolfgang Klenk <[email protected]>
wkl3nk
force-pushed
the
wkl3nk/add-authors-to-concluded-licenses
branch
from
46e8f36 to
642e3d8
Compare
wkl3nk
changed the title
sschuberth
requested changes
Dec 19, 2024
| @@ -83,6 +83,10 @@ class LicenseInfoResolver( | |||
| licenseInfo.concludedLicenseInfo.concludedLicense?.also { | |||
| originalExpressions += ResolvedOriginalExpression(expression = it, source = LicenseSource.CONCLUDED) | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Unfortunately, I had a typo in my proposed commit message: "to be mapped to copyright" needs to say "to be mapped to copyrights".
…nses As concluded licenses are supposed to trump other licenses, they are usually taken instead of declared and detected licenses in reports. When doing do, and the concluded license is not among the other licenses, any author information that is configured to be mapped to copyrights would be dropped. To prevent that, apply the same author to copyright mapping that is done for declared licenses also for concluded licenses. Fixes oss-review-toolkit#9599. Signed-off-by: Wolfgang Klenk <[email protected]>
Verify that package authors defined in a curation file are added to the concluded license if ORT option `addAuthorsToCopyrights` is enabled. Signed-off-by: Wolfgang Klenk <[email protected]>
wkl3nk
force-pushed
the
wkl3nk/add-authors-to-concluded-licenses
branch
from
642e3d8 to
69f0fa4
Compare
sschuberth
approved these changes
Dec 19, 2024
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.
Include authors for package dependencies when both
concluded_licenseandauthorsare curated, and ORT is configured with theaddAuthorsToCopyrightsoption enabled. This ensures that package authors appear under the respective concluded license in the Disclosure Document.This behaviour applies when the Scanner option
skipConcludedis enabled, having the effect that the scan stage is skipped for the particular package dependency in this case, and if either the concluded license is different from the declared license or if no license is declared at all.Fixes #9599.