Refine rules skipped for required phrase

pombredanne · pombredanne · commit 9cee2cb65d39 · 2024-10-08T21:22:24.000+02:00
Signed-off-by: Philippe Ombredanne &lt;pombredanne@nexb.com&gt;
diff --git a/src/licensedcode/data/rules/apache-2.0_1345.RULE b/src/licensedcode/data/rules/apache-2.0_1345.RULE
@@ -7,7 +7,6 @@ referenced_filenames:
 ignorable_urls:
     - http://subversion.tigris.org/
     - http://subversion.tigris.org/license-1.html
-skip_collecting_required_phrases: yes
 ---
 
 This software is licensed as described in the file COPYING, which
@@ -18,4 +17,4 @@ newer version instead, at your option.
 
 This software consists of voluntary contributions made by many
 individuals.  For exact contribution history, see the revision
-history and logs, available at {{http://subversion.tigris.org/}}.
+history and logs, available at http://subversion.tigris.org/.
diff --git a/src/licensedcode/data/rules/apache-2.0_934.RULE b/src/licensedcode/data/rules/apache-2.0_934.RULE
@@ -2,7 +2,6 @@
 license_expression: apache-2.0
 is_license_notice: yes
 relevance: 100
-skip_collecting_required_phrases: yes
 referenced_filenames:
     - LICENSE.txt
 ---
diff --git a/src/licensedcode/data/rules/bsd-new_1043.RULE b/src/licensedcode/data/rules/bsd-new_1043.RULE
@@ -3,10 +3,9 @@ license_expression: bsd-new
 is_license_notice: yes
 relevance: 100
 minimum_coverage: 100
-skip_collecting_required_phrases: yes
 referenced_filenames:
     - INHERIT_LICENSE_FROM_PACKAGE
 ---
 
-This file is distributed under the same license as the
- {{debian}} files of the {{p11-kit}} package.
+This file is distributed under the {{same license as the
+debian files of the p11-kit}} package.
diff --git a/src/licensedcode/data/rules/bsd-new_1044.RULE b/src/licensedcode/data/rules/bsd-new_1044.RULE
@@ -2,10 +2,9 @@
 license_expression: bsd-new
 is_license_notice: yes
 minimum_coverage: 100
-skip_collecting_required_phrases: yes
 referenced_filenames:
     - INHERIT_LICENSE_FROM_PACKAGE
 ---
 
-License: {{same-as-rest-of-p11kit}}
- This file is distributed under the same license as the {{p11-kit}} package.
+{{License: same-as-rest-of-p11kit}}
+ This file is {{distributed under the same license as the p11-kit}} package.
diff --git a/src/licensedcode/data/rules/bsd-new_1118.RULE b/src/licensedcode/data/rules/bsd-new_1118.RULE
@@ -1,8 +1,8 @@
 ---
 license_expression: bsd-new
 is_license_notice: yes
-skip_collecting_required_phrases: yes
+is_required_phrase: yes
 relevance: 100
 ---
 
-License terms appear in {{TCMalloc License}} .
+{{License terms appear in TCMalloc License}}
diff --git a/src/licensedcode/data/rules/bsd-new_1119.RULE b/src/licensedcode/data/rules/bsd-new_1119.RULE
@@ -1,8 +1,8 @@
 ---
 license_expression: bsd-new
 is_license_notice: yes
-skip_collecting_required_phrases: yes
+is_required_phrase: yes
 relevance: 100
 ---
 
-License terms appear in {{Yahoo! UI Library License}} .
+{{License terms appear in Yahoo! UI Library License}}
diff --git a/src/licensedcode/data/rules/bsd-new_1283.RULE b/src/licensedcode/data/rules/bsd-new_1283.RULE
@@ -1,10 +1,9 @@
 ---
 license_expression: bsd-new
 is_license_reference: yes
-skip_collecting_required_phrases: yes
-is_continuous: yes
+is_required_phrase: yes
 ignorable_urls:
     - https://golang.org/LICENSE
 ---
 
-{{https://golang.org/LICENSE}}
+{{ https://golang.org/LICENSE }}
diff --git a/src/licensedcode/data/rules/bsd-new_1284.RULE b/src/licensedcode/data/rules/bsd-new_1284.RULE
@@ -1,8 +1,7 @@
 ---
 license_expression: bsd-new
 is_license_reference: yes
-skip_collecting_required_phrases: yes
-is_continuous: yes
+is_required_phrases: yes
 ignorable_urls:
     - https://go.dev/LICENSE
 ---
diff --git a/src/licensedcode/data/rules/bsd-new_1287.RULE b/src/licensedcode/data/rules/bsd-new_1287.RULE
@@ -1,12 +1,9 @@
 ---
 license_expression: bsd-new
 is_license_reference: yes
-skip_collecting_required_phrases: yes
-is_continuous: yes
-referenced_filenames:
-    - https://github.com/jaxen-xpath/jaxen/blob/master/LICENSE.txt
+is_required_phrase: yes
 ignorable_urls:
     - https://github.com/jaxen-xpath/jaxen/blob/master/LICENSE.txt
 ---
 
-{{https://github.com/jaxen-xpath/jaxen/blob/master/LICENSE.txt}}
+{{ https://github.com/jaxen-xpath/jaxen/blob/master/LICENSE.txt }}
diff --git a/src/licensedcode/data/rules/bsd-new_425.RULE b/src/licensedcode/data/rules/bsd-new_425.RULE
@@ -2,7 +2,6 @@
 license_expression: bsd-new
 is_license_text: yes
 minimum_coverage: 95
-skip_collecting_required_phrases: yes
 ---
 
 This file contains code that was originally under the following license:
diff --git a/src/licensedcode/data/rules/bsd-simplified_336.RULE b/src/licensedcode/data/rules/bsd-simplified_336.RULE
@@ -1,9 +1,8 @@
 ---
 license_expression: bsd-simplified
 is_license_notice: yes
-is_continuous: yes
+is_required_phrase: yes
 relevance: 100
-skip_collecting_required_phrases: yes
 ---
 
-{{BSD-licensed dictionary of Polish}}
+{{ BSD-licensed dictionary of Polish }}
diff --git a/src/licensedcode/data/rules/gpl-2.0-plus_1121.RULE b/src/licensedcode/data/rules/gpl-2.0-plus_1121.RULE
@@ -2,7 +2,7 @@
 license_expression: gpl-2.0-plus
 is_license_notice: yes
 relevance: 100
-skip_collecting_required_phrases: yes
+is_required_phrase: yes
 ---
 
-licensed under the {{TYPO3 GPL}}.
+{{licensed under the TYPO3 GPL}}.
diff --git a/src/licensedcode/data/rules/gpl-2.0-plus_1129.RULE b/src/licensedcode/data/rules/gpl-2.0-plus_1129.RULE
@@ -5,4 +5,4 @@ skip_collecting_required_phrases: yes
 ---
 
 Some of the code in this project {{was originally LGPL v2.1 (or later)
-but is used as GPL v2 (or later) }}
+but is used as GPL v2 (or later) }}
diff --git a/src/licensedcode/data/rules/gpl-2.0_876.RULE b/src/licensedcode/data/rules/gpl-2.0_876.RULE
@@ -1,13 +1,12 @@
 ---
 license_expression: gpl-2.0
 is_license_notice: yes
-skip_collecting_required_phrases: yes
 relevance: 100
 minimum_coverage: 90
 ignorable_urls:
     - http://creativecommons.org/licenses/GPL/2.0
     - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 ---
 
-licensed under a <a href="{{ http://creativecommons.org/licenses/GPL/2.0 }}/">{{Creative Commons GNU General Public License}}</a>
-Please see the <a href=" {{ http://www.gnu.org/licenses/old-licenses/gpl-2.0.html }} ">full text of the {{GNU General Public License}}</a>
+licensed under a <a href {{ http://creativecommons.org/licenses/GPL/2.0 }} /"> {{Creative Commons GNU General Public License}} </a>
+Please see the <a href=" {{ http://www.gnu.org/licenses/old-licenses/gpl-2.0.html }} ">full text of the GNU General Public License </a>
diff --git a/src/licensedcode/data/rules/gpl_bare_word_only.RULE b/src/licensedcode/data/rules/gpl_bare_word_only.RULE
@@ -1,7 +1,6 @@
 ---
 license_expression: gpl-1.0-plus
 is_license_reference: yes
-skip_collecting_required_phrases: yes
 relevance: 50
 ---
 
diff --git a/src/licensedcode/data/rules/lgpl-2.1-plus_499.RULE b/src/licensedcode/data/rules/lgpl-2.1-plus_499.RULE
@@ -8,4 +8,4 @@ skip_collecting_required_phrases: yes
 NOTE: Only {{certain parts}} of the ScummVM project are {{under the GNU LGPL.}}
 
 The majority of the files are {{under the GNU GPL}}. See the headers of the
-individual files to find out the exact license.
+individual files to find out the exact license.
diff --git a/src/licensedcode/data/rules/lgpl-2.1_25.RULE b/src/licensedcode/data/rules/lgpl-2.1_25.RULE
@@ -4,11 +4,11 @@ is_license_notice: yes
 minimum_coverage: 60
 ignorable_urls:
     - http://creativecommons.org/licenses/LGPL/2.1/
-skip_collecting_required_phrases: yes
+    - http://i.creativecommons.org/l/LGPL/2.1/88x62.png
 ---
 
-http://creativecommons.org/licenses/LGPL/2.1/ 
+{{ http://creativecommons.org/licenses/LGPL/2.1/ }}
 Creative Commons License
 http://i.creativecommons.org/l/LGPL/2.1/88x62.png
-This work is licensed under a "http://creativecommons.org/licenses/LGPL/2.1/ 
-Creative Commons {{GNU Lesser General Public License}} License
+{{ This work is licensed under a http://creativecommons.org/licenses/LGPL/2.1/ }} 
+{{ Creative Commons GNU Lesser General Public License}} License
diff --git a/src/licensedcode/data/rules/lgpl-3.0_311.RULE b/src/licensedcode/data/rules/lgpl-3.0_311.RULE
@@ -1,11 +1,10 @@
 ---
 license_expression: lgpl-3.0
 is_license_tag: yes
-is_continuous: yes
 relevance: 100
 ignorable_urls:
     - http://jasperreports.sourceforge.net/license.html
-skip_collecting_required_phrases: yes
+is_required_phrase: yes
 ---
 
-{{http://jasperreports.sourceforge.net/license.html}}
+{{ http://jasperreports.sourceforge.net/license.html }}
diff --git a/src/licensedcode/data/rules/mit_1155.RULE b/src/licensedcode/data/rules/mit_1155.RULE
@@ -2,7 +2,7 @@
 license_expression: mit
 is_license_notice: yes
 relevance: 100
-skip_collecting_required_phrases: yes
+is_required_phrase: yes
 ---
 
-For license terms see {{SLF4J}}
+{{ For license terms see SLF4J }}
diff --git a/src/licensedcode/data/rules/mit_1312.RULE b/src/licensedcode/data/rules/mit_1312.RULE
@@ -7,4 +7,4 @@ referenced_filenames:
     - LICENSE.RFL
 ---
 
-licensed under a {{MIT like license (see LICENSE.RFL).}}
+licensed under a {{MIT like license (see LICENSE.RFL).}}
diff --git a/src/licensedcode/data/rules/mpl-1.0_15.RULE b/src/licensedcode/data/rules/mpl-1.0_15.RULE
@@ -7,4 +7,4 @@ notes: this could be MPL 1.1 or 2.0. The 1.0 and up allow upgrade to newer versi
     is always correct
 ---
 
-Mozilla Public License
+{{ Mozilla Public License }}
diff --git a/src/licensedcode/data/rules/proprietary-license_975.RULE b/src/licensedcode/data/rules/proprietary-license_975.RULE
@@ -8,7 +8,6 @@ ignorable_copyrights:
     - Copyright (c) by P.J. Plauger
 ignorable_holders:
     - P.J. Plauger
-skip_collecting_required_phrases: yes
 ---
 
-Copyright (c) by {{P.J. Plauger}}, {{licensed by Dinkumware}}, Ltd. ALL RIGHTS RESERVED.
+Copyright (c) {{ by P.J. Plauger, licensed by Dinkumware }}, Ltd. ALL RIGHTS RESERVED.
