-
Notifications
You must be signed in to change notification settings - Fork 33
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
Initial implementation of issue 141 #145
Conversation
Also replaces the Apache 1.0 license text. The license text in the test directories is not valid Apache 1.0 text. Signed-off-by: Gary O'Neall <gary@sourceauditor.com>
int endIndex = -1; | ||
List<String> nonOptionalText = null; | ||
try { | ||
nonOptionalText = getNonOptionalLicenseText(license.getStandardLicenseTemplate(), true); |
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.
NULL_DEREFERENCE: object returned by license.getStandardLicenseTemplate()
could be null and is dereferenced by call to getNonOptionalLicenseText(...)
at line 858.
ℹ️ Learn about @sonatype-lift commands
You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.
Command | Usage |
---|---|
@sonatype-lift ignore |
Leave out the above finding from this PR |
@sonatype-lift ignoreall |
Leave out all the existing findings from this PR |
@sonatype-lift exclude <file|issue|path|tool> |
Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file |
Note: When talking to LiftBot, you need to refresh the page to see its response.
Click here to add LiftBot to another repo.
Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]
🛠 Lift Auto-fixSome 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/spdx/Spdx-Java-Library/145.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/spdx/Spdx-Java-Library/145.diff | git apply Once you're satisfied commit and push your changes in your project. Footnotes |
Thanks @pmonks - Could you sign-off your commits - or you could also just add add a comment to this PR that you agree to the licensing section of the CONTRIBUTING.md file: https://github.com/spdx/Spdx-Java-Library/blob/master/CONTRIBUTING.md#licensing Also - one of the checks in the CI is complaining about a possible null pointer exception - on line Spdx-Java-Library/src/main/java/org/spdx/utility/compare/LicenseCompareHelper.java Line 858 in 180f4a5
An easy fix would be to add a check at the beginning of the method - something like:
If you want to add that to the PR, that would be great. |
Signed-off-by: Peter Monks <pmonks@gmail.com>
@goneall I fixed the linter issue, and signed that final commit as well. I held off on rebasing all of my earlier commits to sign them, as I've been merging from Regardless, I assert here that all of my earlier commits were developed personally by me, and that they meet the requirements of CONTRIBUTING.md#licensing. |
Thanks @pmonks - I'll go ahead and merge this in. BTW - I run into similar false positives on the linter from time to time. |
This is an initial implementation of issue #141 (add support for multi-license texts to license comparison logic).