Add license expression to all rules #74

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
nexB · May 2, 2018 · fc3283e · fc3283e
1 parent 3192915
commit fc3283e
Show file tree

Hide file tree

Showing 4,889 changed files with 5,634 additions and 1,471 deletions.
diff --git a/src/licensedcode/data/rules/389-exception.yml b/src/licensedcode/data/rules/389-exception.yml
@@ -1,4 +1,4 @@
 licenses:
     - gpl-2.0
     - 389-exception
-license_expression: gpl-2.0 with 389-exception
+license_expression: gpl-2.0 WITH 389-exception
diff --git a/src/licensedcode/data/rules/3com-microcode.yml b/src/licensedcode/data/rules/3com-microcode.yml
@@ -1,3 +1,4 @@
 licenses:
     - 3com-microcode
-minimum_coverage: 80
+license_expression: 3com-microcode
+minimum_coverage: 80
diff --git a/src/licensedcode/data/rules/3com-microcode2.yml b/src/licensedcode/data/rules/3com-microcode2.yml
@@ -1,3 +1,4 @@
 licenses:
     - 3com-microcode
-minimum_coverage: 80
+license_expression: 3com-microcode
+minimum_coverage: 80
diff --git a/src/licensedcode/data/rules/3com-microcode3.yml b/src/licensedcode/data/rules/3com-microcode3.yml
@@ -1,3 +1,4 @@
 licenses:
     - 3com-microcode
-minimum_coverage: 80
+license_expression: 3com-microcode
+minimum_coverage: 80
diff --git a/src/licensedcode/data/rules/acdl-1.0.yml b/src/licensedcode/data/rules/acdl-1.0.yml
@@ -1,2 +1,3 @@
 licenses:
     - acdl-1.0
+license_expression: acdl-1.0
diff --git a/src/licensedcode/data/rules/ace-tao.SPDX.yml b/src/licensedcode/data/rules/ace-tao.SPDX.yml
@@ -1,4 +1,5 @@
 licenses:
     - ace-tao
-notes: license text as published by SPDX
+license_expression: ace-tao
 minimum_coverage: 10
+notes: license text as published by SPDX
diff --git a/src/licensedcode/data/rules/ace-tao_1.yml b/src/licensedcode/data/rules/ace-tao_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - ace-tao
+license_expression: ace-tao
diff --git a/src/licensedcode/data/rules/adapt-1.0.yml b/src/licensedcode/data/rules/adapt-1.0.yml
@@ -1,2 +1,3 @@
 licenses:
     - adapt-1.0
+license_expression: adapt-1.0
diff --git a/src/licensedcode/data/rules/adapt-1.0_1.yml b/src/licensedcode/data/rules/adapt-1.0_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - adapt-1.0
+license_expression: adapt-1.0
diff --git a/src/licensedcode/data/rules/adapt-1.0_2.yml b/src/licensedcode/data/rules/adapt-1.0_2.yml
@@ -1,2 +1,3 @@
 licenses:
     - adapt-1.0
+license_expression: adapt-1.0
diff --git a/src/licensedcode/data/rules/adi-bsd.yml b/src/licensedcode/data/rules/adi-bsd.yml
@@ -1,2 +1,3 @@
 licenses:
     - adi-bsd
+license_expression: adi-bsd
diff --git a/src/licensedcode/data/rules/adi-bsd2.yml b/src/licensedcode/data/rules/adi-bsd2.yml
@@ -1,2 +1,3 @@
 licenses:
     - adi-bsd
+license_expression: adi-bsd
diff --git a/src/licensedcode/data/rules/adobe-acrobat-reader-eula.yml b/src/licensedcode/data/rules/adobe-acrobat-reader-eula.yml
@@ -1,3 +1,3 @@
 licenses:
     - adobe-acrobat-reader-eula
-
+license_expression: adobe-acrobat-reader-eula
diff --git a/src/licensedcode/data/rules/adobe-eula.yml b/src/licensedcode/data/rules/adobe-eula.yml
@@ -1,3 +1,3 @@
 licenses:
     - adobe-acrobat-reader-eula
-
+license_expression: adobe-acrobat-reader-eula
diff --git a/src/licensedcode/data/rules/adobe-eula_2.yml b/src/licensedcode/data/rules/adobe-eula_2.yml
@@ -1,3 +1,4 @@
 licenses:
     - adobe-eula
+license_expression: adobe-eula
 minimum_coverage: 70
diff --git a/src/licensedcode/data/rules/adobe-eula_and_gpl.yml b/src/licensedcode/data/rules/adobe-eula_and_gpl.yml
@@ -1,5 +1,6 @@
 licenses:
     - adobe-eula
     - gpl-1.0-plus
-notes: only the packaging is under the GPL 
+license_expression: adobe-eula AND gpl-1.0-plus
 minimum_coverage: 30
+notes: only the packaging is under the GPL
diff --git a/src/licensedcode/data/rules/adobe-scl_1.yml b/src/licensedcode/data/rules/adobe-scl_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - adobe-scl
+license_expression: adobe-scl
diff --git a/src/licensedcode/data/rules/adobe-scl_2.yml b/src/licensedcode/data/rules/adobe-scl_2.yml
@@ -1,3 +1,4 @@
 licenses:
     - adobe-scl
+license_expression: adobe-scl
 minimum_coverage: 100
diff --git a/src/licensedcode/data/rules/afl-1.1.SPDX.yml b/src/licensedcode/data/rules/afl-1.1.SPDX.yml
@@ -1,4 +1,5 @@
 licenses:
     - afl-1.1
-notes: license text as published by SPDX
+license_expression: afl-1.1
 minimum_coverage: 10
+notes: license text as published by SPDX
diff --git a/src/licensedcode/data/rules/afl-1.1.yml b/src/licensedcode/data/rules/afl-1.1.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-1.1
+license_expression: afl-1.1
diff --git a/src/licensedcode/data/rules/afl-1.1_1.yml b/src/licensedcode/data/rules/afl-1.1_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-1.1
+license_expression: afl-1.1
diff --git a/src/licensedcode/data/rules/afl-1.1_2.yml b/src/licensedcode/data/rules/afl-1.1_2.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-1.1
+license_expression: afl-1.1
diff --git a/src/licensedcode/data/rules/afl-1.2.SPDX.yml b/src/licensedcode/data/rules/afl-1.2.SPDX.yml
@@ -1,4 +1,5 @@
 licenses:
     - afl-1.2
-notes: license text as published by SPDX
+license_expression: afl-1.2
 minimum_coverage: 10
+notes: license text as published by SPDX
diff --git a/src/licensedcode/data/rules/afl-1.2_1.yml b/src/licensedcode/data/rules/afl-1.2_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-1.2
+license_expression: afl-1.2
diff --git a/src/licensedcode/data/rules/afl-2.0.SPDX.yml b/src/licensedcode/data/rules/afl-2.0.SPDX.yml
@@ -1,4 +1,5 @@
 licenses:
     - afl-2.0
-notes: license text as published by SPDX
+license_expression: afl-2.0
 minimum_coverage: 10
+notes: license text as published by SPDX
diff --git a/src/licensedcode/data/rules/afl-2.0_1.yml b/src/licensedcode/data/rules/afl-2.0_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-2.0
+license_expression: afl-2.0
diff --git a/src/licensedcode/data/rules/afl-2.0_3.yml b/src/licensedcode/data/rules/afl-2.0_3.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-2.0
+license_expression: afl-2.0
diff --git a/src/licensedcode/data/rules/afl-2.0_4.yml b/src/licensedcode/data/rules/afl-2.0_4.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-2.0
+license_expression: afl-2.0
diff --git a/src/licensedcode/data/rules/afl-2.0_or_lgpl-2.0-plus.yml b/src/licensedcode/data/rules/afl-2.0_or_lgpl-2.0-plus.yml
@@ -2,3 +2,4 @@ licenses:
     - afl-2.0
     - lgpl-2.0-plus
 license_choice: yes
+license_expression: afl-2.0 OR lgpl-2.0-plus
diff --git a/src/licensedcode/data/rules/afl-2.0_or_lgpl-2.0-plus_2.yml b/src/licensedcode/data/rules/afl-2.0_or_lgpl-2.0-plus_2.yml
@@ -2,3 +2,4 @@ licenses:
     - afl-2.0
     - lgpl-2.0-plus
 license_choice: yes
+license_expression: afl-2.0 OR lgpl-2.0-plus
diff --git a/src/licensedcode/data/rules/afl-2.1.yml b/src/licensedcode/data/rules/afl-2.1.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-2.1
+license_expression: afl-2.1
diff --git a/src/licensedcode/data/rules/afl-2.1_1.yml b/src/licensedcode/data/rules/afl-2.1_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-2.1
+license_expression: afl-2.1
diff --git a/src/licensedcode/data/rules/afl-2.1_2.yml b/src/licensedcode/data/rules/afl-2.1_2.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-2.1
+license_expression: afl-2.1
diff --git a/src/licensedcode/data/rules/afl-2.1_3.yml b/src/licensedcode/data/rules/afl-2.1_3.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-2.1
+license_expression: afl-2.1
diff --git a/src/licensedcode/data/rules/afl-2.1_4.yml b/src/licensedcode/data/rules/afl-2.1_4.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-2.1
+license_expression: afl-2.1
diff --git a/src/licensedcode/data/rules/afl-2.1_or_bsd-new.yml b/src/licensedcode/data/rules/afl-2.1_or_bsd-new.yml
@@ -1,5 +1,5 @@
 licenses:
     - afl-2.1
     - bsd-new
-
 license_choice: yes
+license_expression: afl-2.1 OR bsd-new
diff --git a/src/licensedcode/data/rules/afl-2.1_or_bsd-new_2.yml b/src/licensedcode/data/rules/afl-2.1_or_bsd-new_2.yml
@@ -1,5 +1,5 @@
 licenses:
     - afl-2.1
     - bsd-new
-
 license_choice: yes
+license_expression: afl-2.1 OR bsd-new
diff --git a/src/licensedcode/data/rules/afl-2.1_or_bsd-new_3.yml b/src/licensedcode/data/rules/afl-2.1_or_bsd-new_3.yml
@@ -1,5 +1,5 @@
 licenses:
     - afl-2.1
     - bsd-new
-
 license_choice: yes
+license_expression: afl-2.1 OR bsd-new
diff --git a/src/licensedcode/data/rules/afl-2.1_or_bsd-new_4.yml b/src/licensedcode/data/rules/afl-2.1_or_bsd-new_4.yml
@@ -1,5 +1,6 @@
 licenses:
     - afl-2.1
     - bsd-new
-minimum_coverage: 100
 license_choice: yes
+license_expression: afl-2.1 OR bsd-new
+minimum_coverage: 100
diff --git a/src/licensedcode/data/rules/afl-3.0.SPDX.yml b/src/licensedcode/data/rules/afl-3.0.SPDX.yml
@@ -1,4 +1,5 @@
 licenses:
     - afl-3.0
-notes: license text as published by SPDX
+license_expression: afl-3.0
 minimum_coverage: 10
+notes: license text as published by SPDX
diff --git a/src/licensedcode/data/rules/afl-3.0.yml b/src/licensedcode/data/rules/afl-3.0.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-3.0
+license_expression: afl-3.0
diff --git a/src/licensedcode/data/rules/afl-3.0_1.yml b/src/licensedcode/data/rules/afl-3.0_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-3.0
+license_expression: afl-3.0
diff --git a/src/licensedcode/data/rules/afl-3.0_3.yml b/src/licensedcode/data/rules/afl-3.0_3.yml
@@ -1,3 +1,3 @@
 licenses:
     - afl-3.0
-
+license_expression: afl-3.0
diff --git a/src/licensedcode/data/rules/afl-3.0_4.yml b/src/licensedcode/data/rules/afl-3.0_4.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-3.0
+license_expression: afl-3.0
diff --git a/src/licensedcode/data/rules/afl-3.0_5.yml b/src/licensedcode/data/rules/afl-3.0_5.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-3.0
+license_expression: afl-3.0
diff --git a/src/licensedcode/data/rules/afl-3.0_6.yml b/src/licensedcode/data/rules/afl-3.0_6.yml
@@ -1,2 +1,3 @@
 licenses:
     - afl-3.0
+license_expression: afl-3.0
diff --git a/src/licensedcode/data/rules/afpl-8.0.yml b/src/licensedcode/data/rules/afpl-8.0.yml
@@ -1,3 +1,4 @@
 licenses:
     - afpl-8.0
+license_expression: afpl-8.0
 notes: Aladin FPL v8, short
diff --git a/src/licensedcode/data/rules/afpl-9.0.yml b/src/licensedcode/data/rules/afpl-9.0.yml
@@ -1,2 +1,3 @@
 licenses:
     - afpl-9.0
+license_expression: afpl-9.0
diff --git a/src/licensedcode/data/rules/agere-sla.yml b/src/licensedcode/data/rules/agere-sla.yml
@@ -1,2 +1,3 @@
 licenses:
     - agere-sla
+license_expression: agere-sla
diff --git a/src/licensedcode/data/rules/agpl-1.0.yml b/src/licensedcode/data/rules/agpl-1.0.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-1.0
+license_expression: agpl-1.0
diff --git a/src/licensedcode/data/rules/agpl-1.0_1.yml b/src/licensedcode/data/rules/agpl-1.0_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-1.0
+license_expression: agpl-1.0
diff --git a/src/licensedcode/data/rules/agpl-1.0_4.yml b/src/licensedcode/data/rules/agpl-1.0_4.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-1.0
+license_expression: agpl-1.0
diff --git a/src/licensedcode/data/rules/agpl-2.0.yml b/src/licensedcode/data/rules/agpl-2.0.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-2.0
+license_expression: agpl-2.0
diff --git a/src/licensedcode/data/rules/agpl-2.0_1.yml b/src/licensedcode/data/rules/agpl-2.0_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-2.0
+license_expression: agpl-2.0
diff --git a/src/licensedcode/data/rules/agpl-2.0_3.yml b/src/licensedcode/data/rules/agpl-2.0_3.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-2.0
+license_expression: agpl-2.0
diff --git a/src/licensedcode/data/rules/agpl-3.0-plus_1.yml b/src/licensedcode/data/rules/agpl-3.0-plus_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0-plus
+license_expression: agpl-3.0-plus
diff --git a/src/licensedcode/data/rules/agpl-3.0-plus_2.yml b/src/licensedcode/data/rules/agpl-3.0-plus_2.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0-plus
+license_expression: agpl-3.0-plus
diff --git a/src/licensedcode/data/rules/agpl-3.0-plus_3.yml b/src/licensedcode/data/rules/agpl-3.0-plus_3.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0-plus_4.yml b/src/licensedcode/data/rules/agpl-3.0-plus_4.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0-plus_5.yml b/src/licensedcode/data/rules/agpl-3.0-plus_5.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0-plus_6.yml b/src/licensedcode/data/rules/agpl-3.0-plus_6.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0-plus_7.yml b/src/licensedcode/data/rules/agpl-3.0-plus_7.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0-plus_8.yml b/src/licensedcode/data/rules/agpl-3.0-plus_8.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0-plus
+license_expression: agpl-3.0-plus
diff --git a/src/licensedcode/data/rules/agpl-3.0.SPDX.yml b/src/licensedcode/data/rules/agpl-3.0.SPDX.yml
@@ -1,4 +1,5 @@
 licenses:
     - agpl-3.0
-notes: license text as published by SPDX
+license_expression: agpl-3.0
 minimum_coverage: 10
+notes: license text as published by SPDX
diff --git a/src/licensedcode/data/rules/agpl-3.0.yml b/src/licensedcode/data/rules/agpl-3.0.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_1.yml b/src/licensedcode/data/rules/agpl-3.0_1.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_10.yml b/src/licensedcode/data/rules/agpl-3.0_10.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_11.yml b/src/licensedcode/data/rules/agpl-3.0_11.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_12.yml b/src/licensedcode/data/rules/agpl-3.0_12.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_13.yml b/src/licensedcode/data/rules/agpl-3.0_13.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_14.yml b/src/licensedcode/data/rules/agpl-3.0_14.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_15.yml b/src/licensedcode/data/rules/agpl-3.0_15.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_16.yml b/src/licensedcode/data/rules/agpl-3.0_16.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_17.yml b/src/licensedcode/data/rules/agpl-3.0_17.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_18.yml b/src/licensedcode/data/rules/agpl-3.0_18.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_19.yml b/src/licensedcode/data/rules/agpl-3.0_19.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_2.yml b/src/licensedcode/data/rules/agpl-3.0_2.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_20.yml b/src/licensedcode/data/rules/agpl-3.0_20.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_21.yml b/src/licensedcode/data/rules/agpl-3.0_21.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_22.yml b/src/licensedcode/data/rules/agpl-3.0_22.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_23.yml b/src/licensedcode/data/rules/agpl-3.0_23.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_24.yml b/src/licensedcode/data/rules/agpl-3.0_24.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_25.yml b/src/licensedcode/data/rules/agpl-3.0_25.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_26.yml b/src/licensedcode/data/rules/agpl-3.0_26.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_27.yml b/src/licensedcode/data/rules/agpl-3.0_27.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0
diff --git a/src/licensedcode/data/rules/agpl-3.0_28.yml b/src/licensedcode/data/rules/agpl-3.0_28.yml
@@ -1,2 +1,3 @@
 licenses:
     - agpl-3.0
+license_expression: agpl-3.0