-
Notifications
You must be signed in to change notification settings - Fork 13
license-gather-plugin: Fixed MANIFEST check is always skipped #48
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 file contains hidden or 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 file contains hidden or 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
70 changes: 70 additions & 0 deletions
70
...ther-plugin/src/main/kotlin/com/github/vlsi/gradle/license/api/OsgiBundleLicenseParser.kt
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright 2019 Vladimir Sitnikov <[email protected]> | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package com.github.vlsi.gradle.license.api | ||
|
|
||
| import org.slf4j.LoggerFactory | ||
| import java.net.URI | ||
| import java.net.URISyntaxException | ||
|
|
||
| class OsgiBundleLicenseParser( | ||
| private val licenseExpressionParser: LicenseExpressionParser, | ||
| private val lookupLicenseByUri: (URI) -> LicenseExpression? | ||
| ) { | ||
| private val logger = LoggerFactory.getLogger(OsgiBundleLicenseParser::class.java) | ||
|
|
||
| fun parseOrNull(bundleLicense: String, context: Any): LicenseExpression? { | ||
| return if (bundleLicense.contains(',')) { | ||
| logger.info( | ||
| "Ignoring Bundle-License '{}' in {} since it contains multiple license references", | ||
| bundleLicense, | ||
| context | ||
| ) | ||
| null | ||
| } else if (bundleLicense.startsWith("http")) { | ||
| // Infer license from the URI | ||
| val uri = try { | ||
| URI(bundleLicense) | ||
| } catch (e: URISyntaxException) { | ||
| logger.info( | ||
| "Invalid URI for license in Bundle-License value '{}' in {}", | ||
| bundleLicense, | ||
| context, | ||
| e | ||
| ) | ||
| return null | ||
| } | ||
| lookupLicenseByUri(uri) | ||
| } else { | ||
| // Infer license from "SPDX-Expression; licenseURI" | ||
| // We ignore URI as the expression should be more important | ||
| bundleLicense.substringBefore(";").let { | ||
| try { | ||
| licenseExpressionParser.parse(it) | ||
| } catch (e: ParseException) { | ||
| logger.info( | ||
| "Unable to parse Bundle-License value '{}' in {}", | ||
| bundleLicense, | ||
| context, | ||
| e | ||
| ) | ||
| null | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
64 changes: 64 additions & 0 deletions
64
...ther-plugin/src/test/kotlin/com/github/vlsi/gradle/license/OsgiBundleLicenseParserTest.kt
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Copyright 2019 Vladimir Sitnikov <[email protected]> | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package com.github.vlsi.gradle.license | ||
|
|
||
| import com.github.vlsi.gradle.license.api.LicenseExpressionParser | ||
| import com.github.vlsi.gradle.license.api.OsgiBundleLicenseParser | ||
| import com.github.vlsi.gradle.license.api.SpdxLicense | ||
| import com.github.vlsi.gradle.license.api.asExpression | ||
| import org.junit.jupiter.api.Assertions.assertEquals | ||
| import org.junit.jupiter.api.Assertions.assertNull | ||
| import org.junit.jupiter.params.ParameterizedTest | ||
| import org.junit.jupiter.params.provider.CsvSource | ||
|
|
||
| class OsgiBundleLicenseParserTest { | ||
| @ParameterizedTest | ||
| @CsvSource( | ||
| "license from https uri^Apache-2.0^https://www.apache.org/licenses/LICENSE-2.0", | ||
| "license from http uri^Apache-2.0^http://www.apache.org/licenses/LICENSE-2.0", | ||
| "license from https uri^Apache-1.0^https://www.apache.org/licenses/LICENSE-1.0", | ||
| "license from SPDX^Apache-2.0^Apache-2.0;https://www.apache.org/licenses/LICENSE-1.0", | ||
| "SPDX expression^Apache-1.0 OR Apache-2.0^Apache-2.0 OR Apache-1.0;https://www.apache.org/licenses/LICENSE-1.0", | ||
| delimiter = '^' | ||
| ) | ||
| fun success(comment: String, expected: String, input: String) { | ||
| val parser = OsgiBundleLicenseParser(LicenseExpressionParser()) { | ||
| SpdxLicense.fromUriOrNull(it)?.asExpression() | ||
| } | ||
| assertEquals(expected, parser.parseOrNull(input, "test input").toString()) { | ||
| "$comment, input: $input" | ||
| } | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @CsvSource( | ||
| "unknown uri^https://www.apache.org/licenses/LICENSE-1.2", | ||
| "invalid expression^Apache OR;http://www.apache.org/licenses/LICENSE-2.0", | ||
| "multiple licenses^license1,license2", | ||
| "multiple licenses^Apache-2.0;https://www.apache.org/licenses/LICENSE-2.0,Apache_1.0;https://www.apache.org/licenses/LICENSE-1.0", | ||
| delimiter = '^' | ||
| ) | ||
| fun fail(comment: String, input: String) { | ||
| val parser = OsgiBundleLicenseParser(LicenseExpressionParser()) { | ||
| SpdxLicense.fromUriOrNull(it)?.asExpression() | ||
| } | ||
| assertNull(parser.parseOrNull(input, "test input")) { | ||
| "$comment should cause OsgiBundleLicenseParser.parse failure, input: $input" | ||
| } | ||
| } | ||
| } |
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.
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.
This is a nice catch. It might be worth filing an IDEA ticket to https://youtrack.jetbrains.com
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.
Created https://youtrack.jetbrains.com/issue/KTIJ-20652