diff --git a/src/licensedcode/data/rules/apache-2.0_or_bsd-new_11.RULE b/src/licensedcode/data/rules/apache-2.0_or_bsd-new_11.RULE new file mode 100644 index 0000000000..67684ca1cd --- /dev/null +++ b/src/licensedcode/data/rules/apache-2.0_or_bsd-new_11.RULE @@ -0,0 +1,14 @@ +--- +license_expression: apache-2.0 OR bsd-new +is_license_notice: yes +relevance: 99 +referenced_filenames: + - LICENSE.APACHE + - LICENSE.BSD +ignorable_urls: + - http://www.apache.org/licenses/LICENSE-2.0 + - http://opensource.org/licenses/MIT +--- + +This software is made available under the terms of *either* of the licenses +found in LICENSE.APACHE or LICENSE.BSD. \ No newline at end of file diff --git a/src/licensedcode/data/rules/apache-2.0_or_bsd-new_8.RULE b/src/licensedcode/data/rules/apache-2.0_or_bsd-new_8.RULE index 9f2f526ed2..aeaede8c0f 100644 --- a/src/licensedcode/data/rules/apache-2.0_or_bsd-new_8.RULE +++ b/src/licensedcode/data/rules/apache-2.0_or_bsd-new_8.RULE @@ -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. \ No newline at end of file +found in {{LICENSE.APACHE}} or {{LICENSE.BSD}}. Both must be present for this rule to apply. \ No newline at end of file diff --git a/src/licensedcode/data/rules/apache-2.0_or_mit_1.RULE b/src/licensedcode/data/rules/apache-2.0_or_mit_1.RULE index 36cf39abdf..db483f1e84 100644 --- a/src/licensedcode/data/rules/apache-2.0_or_mit_1.RULE +++ b/src/licensedcode/data/rules/apache-2.0_or_mit_1.RULE @@ -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.}} \ No newline at end of file +This software is made available under the terms of *either* of the licenses +found in LICENSE.APACHE2 or LICENSE.MIT.