Skip to content

Commit 8889ab5

Browse files
pombredannepombredanne
committed
Improve license rules and tests
Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent 471ccc2 commit 8889ab5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+236
-241
lines changed

‎src/licensedcode/data/rules/apache-2.0_1247.RULE

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
---
22
license_expression: apache-2.0
33
is_license_notice: yes
4+
is_deprecated: yes
5+
replaced_by:
6+
- apache-2.0
7+
- apache-2.0
48
ignorable_urls:
59
- http://www.apache.org/licenses/LICENSE-2.0.txt
610
- https://www.apache.org/
7-
is_deprecated: yes
811
---
912

1013
From: 'The Apache Software Foundation' (https://www.apache.org/)
1114
License: The {{Apache Software License, Version 2.0}} (http://www.apache.org/licenses/LICENSE-2.0.txt)
12-
License: The {{Apache Software License, Version 2.0}} (http://www.apache.org/licenses/LICENSE-2.0.txt)
15+
License: The {{Apache Software License, Version 2.0}} (http://www.apache.org/licenses/LICENSE-2.0.txt)

‎src/licensedcode/data/rules/apache-2.0_13.RULE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ ignorable_urls:
66
- http://www.apache.org/licenses/LICENSE-2.0
77
---
88

9-
- {{Apache 2.0}} : http://www.apache.org/licenses/LICENSE-2.0
9+
- {{Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 }}

‎src/licensedcode/data/rules/apache-2.0_1368.RULE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
---
22
license_expression: apache-2.0
33
is_license_notice: yes
4+
is_deprecated: yes
45
relevance: 100
6+
replaced_by:
7+
- apache-2.0
58
---
69

710
licensed under the Apache Licence, Version 2.0

‎src/licensedcode/data/rules/apache-2.0_1371.RULE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
---
22
license_expression: apache-2.0
33
is_license_notice: yes
4+
is_deprecated: yes
5+
replaced_by:
6+
- apache-2.0
47
ignorable_urls:
58
- http://www.apache.org/licenses/LICENSE-2.0
69
---

‎src/licensedcode/data/rules/apache-2.0_1373.RULE

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
license_expression: apache-2.0
33
is_license_notice: yes
44
relevance: 100
5+
is_deprecated: yes
6+
replaced_by:
7+
- apache-2.0
58
---
69

7-
provided under the {{Apache-2.0 License}}
10+
provided under the {{Apache-2.0 License}}

‎src/licensedcode/data/rules/apache-2.0_1374.RULE

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
license_expression: apache-2.0
3+
is_license_notice: yes
4+
relevance: 100
5+
referenced_filenames:
6+
- LICENSE
7+
---
8+
9+
License
10+
is {{provided under the Apache-2.0 License](./LICENSE)}}

‎src/licensedcode/data/rules/apache-2.0_1375.RULE

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
license_expression: apache-2.0
3+
is_license_notice: yes
4+
relevance: 100
5+
referenced_filenames:
6+
- LICENSE
7+
---
8+
9+
{{provided under the Apache-2.0 License](./LICENSE)}}

‎src/licensedcode/data/rules/apache-2.0_1376.RULE

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
license_expression: apache-2.0
3+
is_license_notice: yes
4+
relevance: 100
5+
---
6+
7+
{{provided under the Apache-2.0 License}}

‎src/licensedcode/data/rules/apache-2.0_176.RULE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
license_expression: apache-2.0
33
is_license_reference: yes
44
is_required_phrase: yes
5+
is_deprecated: yes
56
relevance: 100
7+
replaced_by:
8+
- apache-2.0
69
---
710

811
Apache 2.0 license

‎src/licensedcode/data/rules/apache-2.0_285.RULE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ ignorable_urls:
66
- http://www.apache.org/licenses/LICENSE-2.0
77
---
88

9-
{{Licensed under the Apache License, Version 2.0 (the "License}}");
9+
Licensed under the {{Apache License, Version 2.0}} (the "License");
1010
you may not use this project except in compliance with the License.
1111
You may obtain a copy of the License at
12-
12+
{{
1313
http://www.apache.org/licenses/LICENSE-2.0
14-
14+
}}
1515
Unless required by applicable law or agreed to in writing, software
1616
distributed under the License is distributed on an "AS IS" BASIS,
1717
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1818
See the License for the specific language governing permissions and
19-
limitations under the License.
19+
limitations under the License.

0 commit comments

Comments
 (0)