Improve Apache and commons clause rules

pombredanne · pombredanne · commit d0b33f8ff8f6 · 2024-10-09T11:11:04.000+02:00
Signed-off-by: Philippe Ombredanne &lt;pombredanne@nexb.com&gt;
diff --git a/src/licensedcode/data/rules/apache-2.0_1215.RULE b/src/licensedcode/data/rules/apache-2.0_1215.RULE
@@ -2,6 +2,7 @@
 license_expression: apache-2.0
 is_license_tag: yes
 relevance: 100
+skip_for_required_phrase_generation: yes
 ---
 
-License {{Apache-2 LICENSE}}
+License {{Apache-2}} LICENSE
diff --git a/src/licensedcode/data/rules/apache-2.0_1216.RULE b/src/licensedcode/data/rules/apache-2.0_1216.RULE
@@ -2,7 +2,8 @@
 license_expression: apache-2.0
 is_license_tag: yes
 relevance: 100
+skip_for_required_phrase_generation: yes
 ---
 
 Bundle-License: "{{Apache License, Version 2.0}}";link="{{https://www.apache
- .org/licenses/LICENSE-2.0.txt}}"
+ .org/licenses/LICENSE-2.0.txt}}"
diff --git a/src/licensedcode/data/rules/apache-2.0_1247.RULE b/src/licensedcode/data/rules/apache-2.0_1247.RULE
@@ -4,6 +4,7 @@ is_license_notice: yes
 ignorable_urls:
     - http://www.apache.org/licenses/LICENSE-2.0.txt
     - https://www.apache.org/
+is_deprecated: yes
 ---
 
 From: 'The Apache Software Foundation' (https://www.apache.org/)
diff --git a/src/licensedcode/data/rules/apache-2.0_216.RULE b/src/licensedcode/data/rules/apache-2.0_216.RULE
@@ -7,5 +7,4 @@ ignorable_urls:
     - https://www.apache.org/licenses/LICENSE-2.0.txt
 ---
 
-https://www.apache
- .org/licenses/LICENSE-2.0.txt
+https://www.apache.org/licenses/LICENSE-2.0.txt
diff --git a/src/licensedcode/data/rules/apache-2.0_25.RULE b/src/licensedcode/data/rules/apache-2.0_25.RULE
@@ -7,4 +7,4 @@ ignorable_urls:
     - http://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_1.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_1.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - http://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") and the Commons
-Clause Restriction; you may not use this file except in compliance with the
+Licensed under the {{Apache License, Version 2.0 (the "License") and the Commons
+Clause Restriction;}} you may not use this file except in compliance with the
 License. You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
@@ -33,4 +33,4 @@ Condition notice.
 
 For purposes of the clause above, the “Licensor” is , Inc., the
 “License” is the Apache License, Version 2.0, and the Software is the 
-software provided with this notice.
+software provided with this notice.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_10.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_10.RULE
@@ -6,4 +6,4 @@ relevance: 100
 
 License
 
-n8n is fair-code licensed under Apache 2.0 with Commons Clause
+n8n is fair-code licensed under {{Apache 2.0 with Commons Clause}}
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_11.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_11.RULE
@@ -6,4 +6,4 @@ relevance: 100
 
 License
 
- is fair-code licensed under Apache 2.0 with Commons Clause
+ is fair-code licensed under {{Apache 2.0 with Commons Clause}}
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_12.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_12.RULE
@@ -4,4 +4,4 @@ is_license_notice: yes
 relevance: 100
 ---
 
-fair-code licensed under Apache 2.0 with Commons Clause
+fair-code licensed under {{Apache 2.0 with Commons Clause}}
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_13.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_13.RULE
@@ -4,4 +4,4 @@ is_license_notice: yes
 relevance: 100
 ---
 
-licensed under Apache 2.0 with Commons Clause
+licensed under {{Apache 2.0 with Commons Clause}}
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_14.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_14.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - http://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") and the Commons
-Clause Restriction; you may not use this file except in compliance with the
+Licensed under {{the Apache License, Version 2.0 (the "License") and the Commons
+Clause Restriction;}} you may not use this file except in compliance with the
 License. You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
@@ -17,4 +17,4 @@ A copy of the license is also reproduced below.
 Unless required by applicable law or agreed to in writing, software distributed
 under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
+specific language governing permissions and limitations under the License.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_15.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_15.RULE
@@ -6,13 +6,13 @@ ignorable_urls:
     - http://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") and the Commons
-Clause Restriction; you may not use this file except in compliance with the
+Licensed under the {{Apache License, Version 2.0 (the "License") and the Commons
+Clause Restriction}}; you may not use this file except in compliance with the
 License. You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software distributed
 under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
+specific language governing permissions and limitations under the License.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_16.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_16.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - http://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") and the Commons
-Clause Restriction; you may not use this file except in compliance with the
+Licensed under the {{Apache License, Version 2.0 (the "License") and the Commons
+Clause Restriction}}; you may not use this file except in compliance with the
 License. You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
@@ -33,4 +33,4 @@ by the License must also include this Commons Cause License Condition notice.
 
 For purposes of the clause above, the “Licensor” is , the
 “License” is the Apache License, Version 2.0, and the Software is the 
-software provided with this notice.
+software provided with this notice.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_17.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_17.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - http://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") and the Commons
-Clause Restriction; you may not use this file except in compliance with the
+Licensed under the {{Apache License, Version 2.0 (the "License") and the Commons
+Clause Restriction;}} you may not use this file except in compliance with the
 License. You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
@@ -31,4 +31,4 @@ by the License must also include this Commons Cause License Condition notice.
 
 For purposes of the clause above, the “Licensor” is , the
 “License” is the Apache License, Version 2.0, and the Software is the 
-software provided with this notice.
+software provided with this notice.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_18.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_18.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - https://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") and the Commons
-Clause Restriction; you may not use this file except in compliance with the
+Licensed under the {{Apache License, Version 2.0 (the "License") and the Commons
+Clause Restriction;}} you may not use this file except in compliance with the
 License. You may obtain a copy of the License at
 
     https://www.apache.org/licenses/LICENSE-2.0
@@ -17,4 +17,4 @@ A copy of the license is also reproduced below.
 Unless required by applicable law or agreed to in writing, software distributed
 under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
+specific language governing permissions and limitations under the License.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_19.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_19.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - https://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") and the Commons
-Clause Restriction; you may not use this file except in compliance with the
+Licensed under the {{Apache License, Version 2.0 (the "License") and the Commons
+Clause Restriction;}} you may not use this file except in compliance with the
 License. You may obtain a copy of the License at
 
     https://www.apache.org/licenses/LICENSE-2.0
@@ -31,4 +31,4 @@ by the License must also include this Commons Cause License Condition notice.
 
 For purposes of the clause above, the “Licensor” is , the
 “License” is the Apache License, Version 2.0, and the Software is the 
-software provided with this notice.
+software provided with this notice.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_2.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_2.RULE
@@ -4,5 +4,5 @@ is_license_notice: yes
 relevance: 100
 ---
 
-* This file is available under the Apache License, Version 2.0,
- * with the Commons Clause restriction.
+* This file is available under the {{Apache License, Version 2.0,
+ * with the Commons Clause restriction.}}
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_20.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_20.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - https://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") and the Commons
-Clause Restriction; you may not use this file except in compliance with the
+Licensed under the {{Apache License, Version 2.0 (the "License") and the Commons
+Clause Restriction;}} you may not use this file except in compliance with the
 License. You may obtain a copy of the License at
 
     https://www.apache.org/licenses/LICENSE-2.0
@@ -19,7 +19,7 @@ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 
-### Commons Clause Restriction
+### {{Commons Clause Restriction}}
 
 The Software is provided to you by the Licensor under the License, as defined
 below, subject to the following condition. Without limiting other conditions in
@@ -33,4 +33,4 @@ by the License must also include this Commons Cause License Condition notice.
 
 For purposes of the clause above, the “Licensor” is , the
 “License” is the Apache License, Version 2.0, and the Software is the 
-software provided with this notice.
+software provided with this notice.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_21.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_21.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - https://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") modified with Commons Clause
-Restriction; you may not use this file except in compliance with the License. You may obtain a
+Licensed under the {{Apache License, Version 2.0 (the "License") modified with Commons Clause
+Restriction;}} you may not use this file except in compliance with the License. You may obtain a
 copy of the License at
 
 https://www.apache.org/licenses/LICENSE-2.0
@@ -32,4 +32,4 @@ License Condition notice.
 
 For purposes of the clause above, the “Licensor” is ., the “License” is the Apache
 License, Version 2.0, and the Software is the  software provided with this
-notice.
+notice.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_22.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_22.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - https://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") and the Commons
-Clause Restriction; you may not use this file except in compliance with the
+Licensed under the {{Apache License, Version 2.0 (the "License") and the Commons
+Clause Restriction; }} you may not use this file except in compliance with the
 License. You may obtain a copy of the License at
 
     https://www.apache.org/licenses/LICENSE-2.0
@@ -33,4 +33,4 @@ Condition notice.
 
 For purposes of the clause above, the “Licensor” is , Inc., the
 “License” is the Apache License, Version 2.0, and the Software is the 
-software provided with this notice.
+software provided with this notice.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_23.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_23.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - https://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") modified with Commons Clause
-Restriction; you may not use this file except in compliance with the License. You may obtain a
+Licensed under the {{Apache License, Version 2.0 (the "License") modified with Commons Clause
+Restriction; }} you may not use this file except in compliance with the License. You may obtain a
 copy of the License at
 
 https://www.apache.org/licenses/LICENSE-2.0
@@ -32,4 +32,4 @@ License Condition notice.
 
 For purposes of the clause above, the “Licensor” is , the “License” is the Apache
 License, Version 2.0, and the Software is the  software provided with this
-notice.
+notice.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_24.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_24.RULE
@@ -6,13 +6,13 @@ ignorable_urls:
     - https://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") and the Commons
-Clause Restriction; you may not use this file except in compliance with the
+Licensed under the {{Apache License, Version 2.0 (the "License") and the Commons
+Clause Restriction}}; you may not use this file except in compliance with the
 License. You may obtain a copy of the License at
 
     https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software distributed
 under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
+specific language governing permissions and limitations under the License.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_3.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_3.RULE
@@ -4,4 +4,4 @@ is_license_reference: yes
 relevance: 100
 ---
 
-licensed Apache 2.0 modified with Commons Clause
+licensed {{Apache 2.0 modified with Commons Clause}}
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_4.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_4.RULE
@@ -2,6 +2,8 @@
 license_expression: apache-2.0 WITH commons-clause
 is_license_reference: yes
 relevance: 100
+referenced_filenames:
+  - LICENSE
 ---
 
-Apache 2.0 with Commons Clause - see LICENSE
+{{Apache 2.0 with Commons Clause}} - see LICENSE
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_5.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_5.RULE
@@ -1,7 +1,8 @@
 ---
 license_expression: apache-2.0 WITH commons-clause
 is_license_reference: yes
+is_required_phrase: yes
 relevance: 100
 ---
 
-Apache 2.0 with Commons Clause
+Apache 2.0 with Commons Clause
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_6.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_6.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - http://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") modified with Commons Clause
-Restriction; you may not use this file except in compliance with the License. You may obtain a
+Licensed under the {{Apache License, Version 2.0 (the "License") modified with Commons Clause
+Restriction; }} you may not use this file except in compliance with the License. You may obtain a
 copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
@@ -17,7 +17,7 @@ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 KIND, either express or implied. See the License for the specific language governing permissions
 and limitations under the License.
 
-Commons Clause Restriction
+{{Commons Clause Restriction}}
 
 The Software is provided to you by the Licensor under the License, as defined below, subject to
 the following condition.
@@ -32,4 +32,4 @@ License Condition notice.
 
 For purposes of the clause above, the “Licensor” is , the “License” is the Apache
 License, Version 2.0, and the Software is the  software provided with this
-notice.
+notice.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_7.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_7.RULE
@@ -6,8 +6,8 @@ ignorable_urls:
     - http://www.apache.org/licenses/LICENSE-2.0
 ---
 
-Licensed under the Apache License, Version 2.0 (the "License") modified with Commons Clause
-Restriction; you may not use this file except in compliance with the License. You may obtain a
+Licensed under the {{Apache License, Version 2.0 (the "License") modified with Commons Clause
+Restriction;}} you may not use this file except in compliance with the License. You may obtain a
 copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
@@ -32,4 +32,4 @@ License Condition notice.
 
 For purposes of the clause above, the “Licensor” is ., the “License” is the Apache
 License, Version 2.0, and the Software is the  software provided with this
-notice.
+notice.
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_8.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_8.RULE
@@ -4,4 +4,4 @@ is_license_tag: yes
 relevance: 100
 ---
 
-license: Apache 2.0 with Commons Clause
+license: {{Apache 2.0 with Commons Clause}}
diff --git a/src/licensedcode/data/rules/apache-2.0_with_commons-clause_9.RULE b/src/licensedcode/data/rules/apache-2.0_with_commons-clause_9.RULE
diff --git a/src/licensedcode/data/rules/commons-clause_1.RULE b/src/licensedcode/data/rules/commons-clause_1.RULE
diff --git a/src/licensedcode/data/rules/commons-clause_10.RULE b/src/licensedcode/data/rules/commons-clause_10.RULE
diff --git a/src/licensedcode/data/rules/commons-clause_2.RULE b/src/licensedcode/data/rules/commons-clause_2.RULE
diff --git a/src/licensedcode/data/rules/commons-clause_3.RULE b/src/licensedcode/data/rules/commons-clause_3.RULE
diff --git a/src/licensedcode/data/rules/commons-clause_4.RULE b/src/licensedcode/data/rules/commons-clause_4.RULE
diff --git a/src/licensedcode/data/rules/commons-clause_5.RULE b/src/licensedcode/data/rules/commons-clause_5.RULE
diff --git a/src/licensedcode/data/rules/commons-clause_6.RULE b/src/licensedcode/data/rules/commons-clause_6.RULE
diff --git a/src/licensedcode/data/rules/commons-clause_7.RULE b/src/licensedcode/data/rules/commons-clause_7.RULE
diff --git a/src/licensedcode/data/rules/commons-clause_8.RULE b/src/licensedcode/data/rules/commons-clause_8.RULE
diff --git a/src/licensedcode/data/rules/commons-clause_9.RULE b/src/licensedcode/data/rules/commons-clause_9.RULE
diff --git a/src/licensedcode/data/rules/lgpl-2.1_and_commons-clause_1.RULE b/src/licensedcode/data/rules/lgpl-2.1_and_commons-clause_1.RULE

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ relevance: 100`
`6`	`6`
`7`	`7`	`License`
`8`	`8`
`9`		`-n8n is fair-code licensed under Apache 2.0 with Commons Clause`
	`9`	`+n8n is fair-code licensed under {{Apache 2.0 with Commons Clause}}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ relevance: 100`
`6`	`6`
`7`	`7`	`License`
`8`	`8`
`9`		`- is fair-code licensed under Apache 2.0 with Commons Clause`
	`9`	`+ is fair-code licensed under {{Apache 2.0 with Commons Clause}}`