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 support for using LicenseExpression in converter #252

Merged
merged 3 commits into from
Sep 24, 2024
Merged

Conversation

goneall
Copy link
Member

@goneall goneall commented Sep 11, 2024

Adds an option to the Spdx2to3Converter to use simple licensing license expressions instead of the
ExpandedLicensing fully modelled license expressions

Also includes a fix for #250

Adds an option to the Spdx2to3Converter to use simple
licensing license expressions instead of the
ExpandedLicensing fully modelled license expressions

Also includes a fix for #250

Signed-off-by: Gary O'Neall <[email protected]>
Copy link
Collaborator

@pmonks pmonks left a comment

Choose a reason for hiding this comment

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

Another issue+fix that I don't feel I have a really solid grasp of (I've done very little with the SPDX model to date), but the code changes seems reasonably straight forward and the tests pass locally.

@@ -894,14 +995,51 @@ public ListedLicenseException convertAndStore(org.spdx.library.model.v2.license.
return toListedException;
}

/**
* Converts an SPDX spec version 2 SPDX AnyLicenseIfno to an SPDX spec version 3 LicenseExpression
Copy link
Collaborator

Choose a reason for hiding this comment

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

Typo in AnyLicenseInfo.

@@ -894,14 +995,51 @@ public ListedLicenseException convertAndStore(org.spdx.library.model.v2.license.
return toListedException;
}

/**
* Converts an SPDX spec version 2 SPDX AnyLicenseIfno to an SPDX spec version 3 LicenseExpression
* @param fromLicense an SPDX spec version 2 AnyLicenseIfno
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same typo here too.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the catches @pmonks - I'll add a fix

Signed-off-by: Gary O'Neall <[email protected]>
@goneall goneall merged commit 1353ae4 into master Sep 24, 2024
1 check passed
@goneall goneall deleted the simplelicense branch September 24, 2024 22:59
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