diff --git a/src/licensedcode/data/licenses/apache-2.0-notice.LICENSE b/src/licensedcode/data/licenses/apache-2.0-notice.LICENSE new file mode 100644 index 00000000000..57e8f387d87 --- /dev/null +++ b/src/licensedcode/data/licenses/apache-2.0-notice.LICENSE @@ -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 diff --git a/src/licensedcode/data/rules/apache-2.0.RULE b/src/licensedcode/data/rules/apache-2.0.RULE index 7e4876e65a8..706984e014f 100644 --- a/src/licensedcode/data/rules/apache-2.0.RULE +++ b/src/licensedcode/data/rules/apache-2.0.RULE @@ -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 diff --git a/src/licensedcode/data/rules/apache-2.0_1081.RULE b/src/licensedcode/data/rules/apache-2.0_1081.RULE index f1a6dc59788..cc91e2eb4cd 100644 --- a/src/licensedcode/data/rules/apache-2.0_1081.RULE +++ b/src/licensedcode/data/rules/apache-2.0_1081.RULE @@ -1,5 +1,5 @@ --- -license_expression: apache-2.0 +license_expression: apache-2.0-notice is_license_notice: yes relevance: 100 --- diff --git a/src/licensedcode/data/rules/apache-2.0_1223.RULE b/src/licensedcode/data/rules/apache-2.0_1223.RULE index 5a93fbc156b..ac016f9f46b 100644 --- a/src/licensedcode/data/rules/apache-2.0_1223.RULE +++ b/src/licensedcode/data/rules/apache-2.0_1223.RULE @@ -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 diff --git a/src/licensedcode/data/rules/apache-2.0_1224.RULE b/src/licensedcode/data/rules/apache-2.0_1224.RULE index df79d5d52b2..3d91a939b2e 100644 --- a/src/licensedcode/data/rules/apache-2.0_1224.RULE +++ b/src/licensedcode/data/rules/apache-2.0_1224.RULE @@ -1,5 +1,5 @@ --- -license_expression: apache-2.0 +license_expression: apache-2.0-notice is_license_notice: yes --- diff --git a/src/licensedcode/data/rules/apache-2.0_1229.RULE b/src/licensedcode/data/rules/apache-2.0_1229.RULE index 9459a7b2b83..d63d3ab7388 100644 --- a/src/licensedcode/data/rules/apache-2.0_1229.RULE +++ b/src/licensedcode/data/rules/apache-2.0_1229.RULE @@ -1,5 +1,5 @@ --- -license_expression: apache-2.0 +license_expression: apache-2.0-notice is_license_notice: yes --- diff --git a/src/licensedcode/data/rules/apache-2.0_300.RULE b/src/licensedcode/data/rules/apache-2.0_300.RULE index f3027e36cec..9de2c5f643d 100644 --- a/src/licensedcode/data/rules/apache-2.0_300.RULE +++ b/src/licensedcode/data/rules/apache-2.0_300.RULE @@ -1,5 +1,5 @@ --- -license_expression: apache-2.0 +license_expression: apache-2.0-notice is_license_notice: yes relevance: 100 --- diff --git a/src/licensedcode/data/rules/apache-2.0_399.RULE b/src/licensedcode/data/rules/apache-2.0_399.RULE index 5515305558c..52e3091207b 100644 --- a/src/licensedcode/data/rules/apache-2.0_399.RULE +++ b/src/licensedcode/data/rules/apache-2.0_399.RULE @@ -1,5 +1,5 @@ --- -license_expression: apache-2.0 +license_expression: apache-2.0-notice is_license_notice: yes relevance: 100 --- diff --git a/src/licensedcode/data/rules/apache-2.0_423.RULE b/src/licensedcode/data/rules/apache-2.0_423.RULE index dd1b009470c..f9cb4f8fa57 100644 --- a/src/licensedcode/data/rules/apache-2.0_423.RULE +++ b/src/licensedcode/data/rules/apache-2.0_423.RULE @@ -1,5 +1,5 @@ --- -license_expression: apache-2.0 +license_expression: apache-2.0-notice is_license_notice: yes relevance: 100 --- diff --git a/src/licensedcode/data/rules/apache-2.0_741.RULE b/src/licensedcode/data/rules/apache-2.0_741.RULE index 3beddace112..bced090baf8 100644 --- a/src/licensedcode/data/rules/apache-2.0_741.RULE +++ b/src/licensedcode/data/rules/apache-2.0_741.RULE @@ -1,5 +1,5 @@ --- -license_expression: apache-2.0 +license_expression: apache-2.0-notice is_license_notice: yes relevance: 100 ignorable_authors: diff --git a/src/licensedcode/data/rules/apache-2.0_notice_1.RULE b/src/licensedcode/data/rules/apache-2.0_notice_1.RULE index 2f750606844..938e829ffa2 100644 --- a/src/licensedcode/data/rules/apache-2.0_notice_1.RULE +++ b/src/licensedcode/data/rules/apache-2.0_notice_1.RULE @@ -1,5 +1,5 @@ --- -license_expression: apache-2.0 +license_expression: apache-2.0-notice is_license_notice: yes relevance: 100 minimum_coverage: 80 diff --git a/tests/licensedcode/data/datadriven/lic2/apache-2.0-notice_for_use.txt b/tests/licensedcode/data/datadriven/lic2/apache-2.0-notice_for_use.txt new file mode 100644 index 00000000000..8918d4ce99d --- /dev/null +++ b/tests/licensedcode/data/datadriven/lic2/apache-2.0-notice_for_use.txt @@ -0,0 +1,2 @@ +NOTICE file for use with the Apache License, Version 2.0, +Copyright 2020 Example Project Contributors diff --git a/tests/licensedcode/data/datadriven/lic2/apache-2.0-notice_for_use.txt.yml b/tests/licensedcode/data/datadriven/lic2/apache-2.0-notice_for_use.txt.yml new file mode 100644 index 00000000000..270f44d4d49 --- /dev/null +++ b/tests/licensedcode/data/datadriven/lic2/apache-2.0-notice_for_use.txt.yml @@ -0,0 +1,3 @@ +license_expressions: + - apache-2.0-notice +notes: Regression for https://github.com/aboutcode-org/scancode-toolkit/issues/2708 diff --git a/tests/licensedcode/data/datadriven/lic2/apache-2.0_11.txt.yml b/tests/licensedcode/data/datadriven/lic2/apache-2.0_11.txt.yml index a9e02b1a85a..42207bacbe8 100644 --- a/tests/licensedcode/data/datadriven/lic2/apache-2.0_11.txt.yml +++ b/tests/licensedcode/data/datadriven/lic2/apache-2.0_11.txt.yml @@ -1,2 +1,2 @@ license_expressions: - - apache-2.0 + - apache-2.0-notice