Skip to content

Fix Apache NOTICE detection #5332

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.

Sign up for GitHub

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

Open
archiep867-sys wants to merge 1 commit into
base: develop
Choose a base branch
from
+35 −11
Open

Fix Apache NOTICE detection #5332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions src/licensedcode/data/licenses/apache-2.0-notice.LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
key: apache-2.0-notice
short_name: Apache 2.0 NOTICE
name: Apache License 2.0 NOTICE file
category: Permissive
owner: Apache Software Foundation
homepage_url: http://www.apache.org/licenses/
notes: |
Used to report Apache License 2.0 Section 4 NOTICE files and NOTICE
banners (for example "NOTICE file corresponding to section 4d of the
Apache License Version 2.0" or "NOTICE file for use with the Apache
License, Version 2.0") separately from a plain apache-2.0 detection.
See also https://github.com/aboutcode-org/scancode-toolkit/issues/2708
spdx_license_key: LicenseRef-scancode-apache-2.0-notice
other_urls:
- http://www.apache.org/licenses/LICENSE-2.0
---

NOTICE file corresponding to section 4d of the Apache License Version 2.0
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/apache-2.0.RULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
license_expression: apache-2.0
license_expression: apache-2.0-notice
is_license_notice: yes
minimum_coverage: 70
notes: Common in Apache notices
Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/apache-2.0_1081.RULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
license_expression: apache-2.0
license_expression: apache-2.0-notice
is_license_notice: yes
relevance: 100
---
Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/apache-2.0_1223.RULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
license_expression: apache-2.0
license_expression: apache-2.0-notice
is_license_notice: yes
ignorable_copyrights:
- copyright (c) 2000-2003, BEA Systems, http://www.bea.com
Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/apache-2.0_1224.RULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
license_expression: apache-2.0
license_expression: apache-2.0-notice
is_license_notice: yes
---

Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/apache-2.0_1229.RULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
license_expression: apache-2.0
license_expression: apache-2.0-notice
is_license_notice: yes
---

Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/apache-2.0_300.RULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
license_expression: apache-2.0
license_expression: apache-2.0-notice
is_license_notice: yes
relevance: 100
---
Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/apache-2.0_399.RULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
license_expression: apache-2.0
license_expression: apache-2.0-notice
is_license_notice: yes
relevance: 100
---
Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/apache-2.0_423.RULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
license_expression: apache-2.0
license_expression: apache-2.0-notice
is_license_notice: yes
relevance: 100
---
Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/apache-2.0_741.RULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
license_expression: apache-2.0
license_expression: apache-2.0-notice
is_license_notice: yes
relevance: 100
ignorable_authors:
Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/data/rules/apache-2.0_notice_1.RULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
license_expression: apache-2.0
license_expression: apache-2.0-notice
is_license_notice: yes
relevance: 100
minimum_coverage: 80
Expand Down
2 changes: 2 additions & 0 deletions tests/licensedcode/data/datadriven/lic2/apache-2.0-notice_for_use.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
NOTICE file for use with the Apache License, Version 2.0,
Copyright 2020 Example Project Contributors
3 changes: 3 additions & 0 deletions tests/licensedcode/data/datadriven/lic2/apache-2.0-notice_for_use.txt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
license_expressions:
- apache-2.0-notice
notes: Regression for https://github.com/aboutcode-org/scancode-toolkit/issues/2708
2 changes: 1 addition & 1 deletion tests/licensedcode/data/datadriven/lic2/apache-2.0_11.txt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
license_expressions:
- apache-2.0
- apache-2.0-notice
Loading