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

Fix false positive for Apache-2.0 OR BSD-3-Clause and add Apache-2.0 … #4126

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/licensedcode/data/rules/apache-2.0_or_bsd-new_8.RULE
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
license_expression: apache-2.0 OR bsd-new
is_license_notice: yes
relevance: 99
relevance: 100
referenced_filenames:
- LICENSE.APACHE
- LICENSE.BSD
---

This software is made available under the terms of *either* of the licenses
found in LICENSE.APACHE or LICENSE.BSD.
found in {{LICENSE.APACHE}} or {{LICENSE.BSD}}. Both must be present for this rule to apply.
19 changes: 5 additions & 14 deletions src/licensedcode/data/rules/apache-2.0_or_mit_1.RULE
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
---
license_expression: apache-2.0 OR mit
is_license_notice: yes
minimum_coverage: 80
relevance: 100
referenced_filenames:
- LICENSE-APACHE
- LICENSE-MIT
ignorable_urls:
- http://opensource.org/licenses/MIT
- http://www.apache.org/licenses/LICENSE-2.0
- LICENSE.APACHE2
- LICENSE.MIT
---

License

Licensed under either of

{{Apache License, Version 2.0 }}(LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0)
{{MIT license }}(LICENSE-MIT or http://opensource.org/licenses/MIT)

{{at your option.}}
This software is made available under the terms of *either* of the licenses
found in LICENSE.APACHE2 or LICENSE.MIT.