-
Notifications
You must be signed in to change notification settings - Fork 36
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
Conversation
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]>
Signed-off-by: Gary O'Neall <[email protected]>
ef85a7e
to
9f586a6
Compare
There was a problem hiding this 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 |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same typo here too.
There was a problem hiding this comment.
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]>
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