Improve dual BSD/Apache license detection #2214

Reported-by: @lemoshi Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
aboutcode-org · Sep 7, 2020 · c3bf8e5 · c3bf8e5
1 parent 461523e
commit c3bf8e5
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 1 deletion.
diff --git a/src/licensedcode/data/rules/apache-2.0.yml b/src/licensedcode/data/rules/apache-2.0.yml
@@ -1,3 +1,4 @@
 license_expression: apache-2.0
 is_license_notice: yes
+minimum_coverage: 70
 notes: Common in Apache notices
diff --git a/src/licensedcode/data/rules/apache-2.0_409.yml b/src/licensedcode/data/rules/apache-2.0_409.yml
@@ -1,6 +1,7 @@
 license_expression: apache-2.0
 is_license_text: yes
 relevance: 100
+minimum_coverage: 99.5
 ignorable_urls:
     - http://www.apache.org/licenses/
     - http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/licensedcode/data/rules/apache-2.0_62.yml b/src/licensedcode/data/rules/apache-2.0_62.yml
@@ -1,6 +1,6 @@
 license_expression: apache-2.0
 is_license_text: yes
-minimum_coverage: 95
+minimum_coverage: 98.5 
 ignorable_urls:
     - http://www.apache.org/licenses/
     - http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/licensedcode/data/rules/apache-2.0_or_bsd-new_5.RULE b/src/licensedcode/data/rules/apache-2.0_or_bsd-new_5.RULE
@@ -0,0 +1,3 @@
+License
+This work is dual-licensed under Apache 2.0 or BSD3.
+You may select, at your option, one of the above-listed licenses.
diff --git a/src/licensedcode/data/rules/apache-2.0_or_bsd-new_5.yml b/src/licensedcode/data/rules/apache-2.0_or_bsd-new_5.yml
@@ -0,0 +1,3 @@
+license_expression: apache-2.0 OR bsd-new
+is_license_notice: yes
+relevance: 100
diff --git a/src/licensedcode/data/rules/apache-2.0_or_bsd-new_6.RULE b/src/licensedcode/data/rules/apache-2.0_or_bsd-new_6.RULE
@@ -0,0 +1,2 @@
+This work is dual-licensed under Apache 2.0 or BSD3.
+You may select, at your option, one of the above-listed licenses.
diff --git a/src/licensedcode/data/rules/apache-2.0_or_bsd-new_6.yml b/src/licensedcode/data/rules/apache-2.0_or_bsd-new_6.yml
@@ -0,0 +1,3 @@
+license_expression: apache-2.0 OR bsd-new
+is_license_notice: yes
+relevance: 100
diff --git a/src/licensedcode/data/rules/apache-2.0_or_bsd-new_7.RULE b/src/licensedcode/data/rules/apache-2.0_or_bsd-new_7.RULE
@@ -0,0 +1 @@
+This work is dual-licensed under Apache 2.0 or BSD3.
diff --git a/src/licensedcode/data/rules/apache-2.0_or_bsd-new_7.yml b/src/licensedcode/data/rules/apache-2.0_or_bsd-new_7.yml
@@ -0,0 +1,3 @@
+license_expression: apache-2.0 OR bsd-new
+is_license_notice: yes
+relevance: 100
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		This work is dual-licensed under Apache 2.0 or BSD3.
		You may select, at your option, one of the above-listed licenses.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This work is dual-licensed under Apache 2.0 or BSD3.