diff --git a/etc/scripts/licenses/buildrules.py b/etc/scripts/licenses/buildrules.py index d434b926588..731702b0e04 100644 --- a/etc/scripts/licenses/buildrules.py +++ b/etc/scripts/licenses/buildrules.py @@ -61,7 +61,7 @@ class RuleData(object): def __attrs_post_init__(self, *args, **kwargs): self.raw_data = rdat = "\n".join(self.data_lines).strip() - self.text = "\n".join(self.text_lines).strip() + self.text = "\n".join(self.text_lines).strip() + "\n" # validate YAML syntax try: diff --git a/src/licensedcode/data/rules/apache-2.0_1316.RULE b/src/licensedcode/data/rules/apache-2.0_1316.RULE new file mode 100644 index 00000000000..a795e882456 --- /dev/null +++ b/src/licensedcode/data/rules/apache-2.0_1316.RULE @@ -0,0 +1,7 @@ +--- +license_expression: apache-2.0 +is_license_tag: yes +relevance: 100 +--- + +name: The Apache Software License, Version 2.0 \ No newline at end of file diff --git a/src/licensedcode/data/rules/apache-2.0_1317.RULE b/src/licensedcode/data/rules/apache-2.0_1317.RULE new file mode 100644 index 00000000000..6af73b4ed01 --- /dev/null +++ b/src/licensedcode/data/rules/apache-2.0_1317.RULE @@ -0,0 +1,9 @@ +--- +license_expression: apache-2.0 +is_license_tag: yes +relevance: 100 +ignorable_urls: + - http://www.apache.org/license/LICENSE-2.0.txt +--- + +url: http://www.apache.org/license/LICENSE-2.0.txt \ No newline at end of file diff --git a/src/licensedcode/data/rules/apache-2.0_1318.RULE b/src/licensedcode/data/rules/apache-2.0_1318.RULE new file mode 100644 index 00000000000..1152293a520 --- /dev/null +++ b/src/licensedcode/data/rules/apache-2.0_1318.RULE @@ -0,0 +1,9 @@ +--- +license_expression: apache-2.0 +is_license_reference: yes +relevance: 100 +ignorable_urls: + - http://www.apache.org/license/LICENSE-2.0.txt +--- + +http://www.apache.org/license/LICENSE-2.0.txt \ No newline at end of file diff --git a/src/licensedcode/data/rules/authorizenet-sdk_3.RULE b/src/licensedcode/data/rules/authorizenet-sdk_3.RULE new file mode 100644 index 00000000000..5211db15fcb --- /dev/null +++ b/src/licensedcode/data/rules/authorizenet-sdk_3.RULE @@ -0,0 +1,9 @@ +--- +license_expression: authorizenet-sdk +is_license_tag: yes +ignorable_urls: + - https://github.com/AuthorizeNet/sdk-java/blob/master/LICENSE.txt +--- + +name: SDK License Agreement +url: {{https://github.com/AuthorizeNet/sdk-java/blob/master/LICENSE.txt}} \ No newline at end of file diff --git a/src/licensedcode/data/rules/bsd-new_1346.RULE b/src/licensedcode/data/rules/bsd-new_1346.RULE new file mode 100644 index 00000000000..1369c6e98eb --- /dev/null +++ b/src/licensedcode/data/rules/bsd-new_1346.RULE @@ -0,0 +1,10 @@ +--- +license_expression: bsd-new +is_license_tag: yes +ignorable_urls: + - http://www.linfo.org/bsdlicense.html +--- + +name: BSD +url: http://www.linfo.org/bsdlicense.html +comments: Free for open or commercial use, with credit line \ No newline at end of file diff --git a/src/licensedcode/data/rules/epl-2.0_76.RULE b/src/licensedcode/data/rules/epl-2.0_76.RULE new file mode 100644 index 00000000000..7c6f8660637 --- /dev/null +++ b/src/licensedcode/data/rules/epl-2.0_76.RULE @@ -0,0 +1,9 @@ +--- +license_expression: epl-2.0 +is_license_tag: yes +ignorable_urls: + - https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt +--- + +- name: Eclipse Public License v. 2.0 + url: https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt \ No newline at end of file diff --git a/src/licensedcode/data/rules/epl-2.0_77.RULE b/src/licensedcode/data/rules/epl-2.0_77.RULE new file mode 100644 index 00000000000..7551177155d --- /dev/null +++ b/src/licensedcode/data/rules/epl-2.0_77.RULE @@ -0,0 +1,10 @@ +--- +license_expression: epl-2.0 +is_license_tag: yes +ignorable_urls: + - https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt +--- + +license + Eclipse Public License v. 2.0 + https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt \ No newline at end of file diff --git a/src/licensedcode/data/rules/epl-2.0_or_gpl-2.0_with_classpath-exception-2.0_10.RULE b/src/licensedcode/data/rules/epl-2.0_or_gpl-2.0_with_classpath-exception-2.0_10.RULE new file mode 100644 index 00000000000..39671cc9fc7 --- /dev/null +++ b/src/licensedcode/data/rules/epl-2.0_or_gpl-2.0_with_classpath-exception-2.0_10.RULE @@ -0,0 +1,12 @@ +--- +license_expression: epl-2.0 OR gpl-2.0 WITH classpath-exception-2.0 +is_license_tag: yes +ignorable_urls: + - https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + - https://www.gnu.org/software/classpath/license.html +--- + +Eclipse Public License v. 2.0 + https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + GNU General Public License, version 2 with the GNU Classpath Exception + https://www.gnu.org/software/classpath/license.html \ No newline at end of file diff --git a/src/licensedcode/data/rules/epl-2.0_or_gpl-2.0_with_classpath-exception-2.0_11.RULE b/src/licensedcode/data/rules/epl-2.0_or_gpl-2.0_with_classpath-exception-2.0_11.RULE new file mode 100644 index 00000000000..8082dfb85d4 --- /dev/null +++ b/src/licensedcode/data/rules/epl-2.0_or_gpl-2.0_with_classpath-exception-2.0_11.RULE @@ -0,0 +1,13 @@ +--- +license_expression: epl-2.0 OR gpl-2.0 WITH classpath-exception-2.0 +is_license_tag: yes +ignorable_urls: + - https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + - https://www.gnu.org/software/classpath/license.html +--- + +license + Eclipse Public License v. 2.0 + https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + GNU General Public License, version 2 with the GNU Classpath Exception + https://www.gnu.org/software/classpath/license.html \ No newline at end of file diff --git a/src/licensedcode/data/rules/epl-2.0_or_gpl-2.0_with_classpath-exception-2.0_12.RULE b/src/licensedcode/data/rules/epl-2.0_or_gpl-2.0_with_classpath-exception-2.0_12.RULE new file mode 100644 index 00000000000..05467565232 --- /dev/null +++ b/src/licensedcode/data/rules/epl-2.0_or_gpl-2.0_with_classpath-exception-2.0_12.RULE @@ -0,0 +1,13 @@ +--- +license_expression: epl-2.0 OR gpl-2.0 WITH classpath-exception-2.0 +is_license_tag: yes +ignorable_urls: + - https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + - https://www.gnu.org/software/classpath/license.html +--- + +license + Eclipse Public License v. 2.0 + https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + GNU General Public License, version 2 with the GNU Classpath Exception + https://www.gnu.org/software/classpath/license.html \ No newline at end of file diff --git a/src/licensedcode/data/rules/gpl-2.0_with_classpath-exception-2.0_61.RULE b/src/licensedcode/data/rules/gpl-2.0_with_classpath-exception-2.0_61.RULE new file mode 100644 index 00000000000..457287fd5a0 --- /dev/null +++ b/src/licensedcode/data/rules/gpl-2.0_with_classpath-exception-2.0_61.RULE @@ -0,0 +1,9 @@ +--- +license_expression: gpl-2.0 WITH classpath-exception-2.0 +is_license_tag: yes +ignorable_urls: + - https://www.gnu.org/software/classpath/license.html +--- + +- name: GNU General Public License, version 2 with the GNU Classpath Exception + url: https://www.gnu.org/software/classpath/license.html \ No newline at end of file diff --git a/src/licensedcode/data/rules/gpl-2.0_with_classpath-exception-2.0_62.RULE b/src/licensedcode/data/rules/gpl-2.0_with_classpath-exception-2.0_62.RULE new file mode 100644 index 00000000000..28821b68eea --- /dev/null +++ b/src/licensedcode/data/rules/gpl-2.0_with_classpath-exception-2.0_62.RULE @@ -0,0 +1,10 @@ +--- +license_expression: gpl-2.0 WITH classpath-exception-2.0 +is_license_tag: yes +ignorable_urls: + - https://www.gnu.org/software/classpath/license.html +--- + +license + GNU General Public License, version 2 with the GNU Classpath Exception + https://www.gnu.org/software/classpath/license.html \ No newline at end of file diff --git a/src/licensedcode/data/rules/lgpl-3.0_320.RULE b/src/licensedcode/data/rules/lgpl-3.0_320.RULE new file mode 100644 index 00000000000..db08f986519 --- /dev/null +++ b/src/licensedcode/data/rules/lgpl-3.0_320.RULE @@ -0,0 +1,12 @@ +--- +license_expression: lgpl-3.0 +is_license_tag: yes +ignorable_urls: + - http://www.gnu.org/licenses/lgpl.html +--- + + + GNU General Lesser Public License (LGPL) version 3.0 + http://www.gnu.org/licenses/lgpl.html + repo + \ No newline at end of file diff --git a/src/licensedcode/data/rules/lgpl-3.0_321.RULE b/src/licensedcode/data/rules/lgpl-3.0_321.RULE new file mode 100644 index 00000000000..46f0d65ad2d --- /dev/null +++ b/src/licensedcode/data/rules/lgpl-3.0_321.RULE @@ -0,0 +1,9 @@ +--- +license_expression: lgpl-3.0 +is_license_tag: yes +ignorable_urls: + - http://www.gnu.org/licenses/lgpl.html +--- + +- name: GNU General Lesser Public License (LGPL) version 3.0 +url: http://www.gnu.org/licenses/lgpl.html \ No newline at end of file diff --git a/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_1.RULE b/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_1.RULE new file mode 100644 index 00000000000..43363ddff2a --- /dev/null +++ b/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_1.RULE @@ -0,0 +1,13 @@ +--- +license_expression: lgpl-3.0 OR mpl-2.0 +is_license_tag: yes +ignorable_urls: + - http://www.gnu.org/licenses/lgpl.html + - http://www.mozilla.org/MPL/2.0/ +--- + +license +- name: GNU General Lesser Public License (LGPL) version 3.0 +url: http://www.gnu.org/licenses/lgpl.html +- name: Mozilla Public License Version 2.0 +url: http://www.mozilla.org/MPL/2.0/ \ No newline at end of file diff --git a/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_2.RULE b/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_2.RULE new file mode 100644 index 00000000000..f15a6780ba2 --- /dev/null +++ b/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_2.RULE @@ -0,0 +1,14 @@ +--- +license_expression: lgpl-3.0 OR mpl-2.0 +is_license_tag: yes +ignorable_urls: + - http://www.gnu.org/licenses/lgpl.html + - http://www.mozilla.org/MPL/2.0/ +--- + +license +- name: GNU General Lesser Public License (LGPL) version 3.0 +url: http://www.gnu.org/licenses/lgpl.html +- name: Mozilla Public License Version 2.0 +url: http://www.mozilla.org/MPL/2.0/ +license \ No newline at end of file diff --git a/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_3.RULE b/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_3.RULE new file mode 100644 index 00000000000..420afb950e7 --- /dev/null +++ b/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_3.RULE @@ -0,0 +1,15 @@ +--- +license_expression: lgpl-3.0 OR mpl-2.0 +is_license_tag: yes +ignorable_urls: + - http://www.gnu.org/licenses/lgpl.html + - http://www.mozilla.org/MPL/2.0/ +--- + +licenses +license +- name: GNU General Lesser Public License (LGPL) version 3.0 +url: http://www.gnu.org/licenses/lgpl.html +- name: Mozilla Public License Version 2.0 +url: http://www.mozilla.org/MPL/2.0/ +license \ No newline at end of file diff --git a/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_4.RULE b/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_4.RULE new file mode 100644 index 00000000000..d4a51d517ae --- /dev/null +++ b/src/licensedcode/data/rules/lgpl-3.0_or_mpl-2.0_4.RULE @@ -0,0 +1,18 @@ +--- +license_expression: lgpl-3.0 OR mpl-2.0 +is_license_tag: yes +ignorable_urls: + - http://www.gnu.org/licenses/lgpl.html + - http://www.mozilla.org/MPL/2.0/ +--- + + + GNU General Lesser Public License (LGPL) version 3.0 + http://www.gnu.org/licenses/lgpl.html + repo + + + Mozilla Public License Version 2.0 + http://www.mozilla.org/MPL/2.0/ + repo + \ No newline at end of file diff --git a/src/licensedcode/data/rules/license-clue_authorizenet-sdk_1.RULE b/src/licensedcode/data/rules/license-clue_authorizenet-sdk_1.RULE new file mode 100644 index 00000000000..8f2d7bfe8fa --- /dev/null +++ b/src/licensedcode/data/rules/license-clue_authorizenet-sdk_1.RULE @@ -0,0 +1,8 @@ +--- +license_expression: authorizenet-sdk +is_license_clue: yes +is_continuous: yes +relevance: 70 +--- + +{{AuthorizeNet sdk license}} \ No newline at end of file diff --git a/src/licensedcode/data/rules/mpl-2.0_139.RULE b/src/licensedcode/data/rules/mpl-2.0_139.RULE new file mode 100644 index 00000000000..10487fbc8a7 --- /dev/null +++ b/src/licensedcode/data/rules/mpl-2.0_139.RULE @@ -0,0 +1,12 @@ +--- +license_expression: mpl-2.0 +is_license_tag: yes +ignorable_urls: + - http://www.mozilla.org/MPL/2.0/ +--- + + + Mozilla Public License Version 2.0 + http://www.mozilla.org/MPL/2.0/ + repo + \ No newline at end of file diff --git a/src/licensedcode/data/rules/mpl-2.0_140.RULE b/src/licensedcode/data/rules/mpl-2.0_140.RULE new file mode 100644 index 00000000000..8a4c7c7e9e0 --- /dev/null +++ b/src/licensedcode/data/rules/mpl-2.0_140.RULE @@ -0,0 +1,10 @@ +--- +license_expression: mpl-2.0 +is_license_tag: yes +relevance: 100 +ignorable_urls: + - http://www.mozilla.org/MPL/2.0/ +--- + +- name: Mozilla Public License Version 2.0 +url: http://www.mozilla.org/MPL/2.0/ \ No newline at end of file diff --git a/src/licensedcode/data/rules/other-permissive_425.RULE b/src/licensedcode/data/rules/other-permissive_425.RULE new file mode 100644 index 00000000000..b261c3c8454 --- /dev/null +++ b/src/licensedcode/data/rules/other-permissive_425.RULE @@ -0,0 +1,16 @@ +--- +license_expression: other-permissive +is_license_notice: yes +minimum_coverage: 95 +notes: Seen in openpdf See also https://web.archive.org/web/20060113033212/http://www.javaworld.com/javaworld/javatips/jw-javatip128.html +ignorable_urls: + - http://www.javaworld.com/javaworld/javatips/jw-javatip128.html +--- + +SimpleXMLParser: +The original version of this class was published in a JavaWorld article by Steven Brandt: +http://www.javaworld.com/javaworld/javatips/jw-javatip128.html +Jennifer Orr (JavaWorld) wrote: "You have permission to use the code appearing in +Steven Brandt's JavaWorld article, 'Java Tip 128: Create a quick-and-dirty XML parser.' +We ask that you reference the author as the creator and JavaWorld as the original publisher +of the code." Steven Brandt also agreed with the use of this class. \ No newline at end of file diff --git a/src/licensedcode/data/rules/other-permissive_426.RULE b/src/licensedcode/data/rules/other-permissive_426.RULE new file mode 100644 index 00000000000..f7ca2ebd709 --- /dev/null +++ b/src/licensedcode/data/rules/other-permissive_426.RULE @@ -0,0 +1,18 @@ +--- +license_expression: other-permissive +is_license_text: yes +notes: Similar to hpnd-sell-variant-mit-disclaimer and seen in https://gitlab.freedesktop.org/xorg/xserver/-/blob/141e7dd8a373eafe28fb4f6433671979fb4c59a7/COPYING#L1781 +--- + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +this permission notice appear in supporting documentation. This permission +notice shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/tests/licensedcode/data/datadriven/lic4/sun-bsd-no-nuclear_and_x11-tiff_and_unicode.txt.yml b/tests/licensedcode/data/datadriven/lic4/sun-bsd-no-nuclear_and_x11-tiff_and_unicode.txt.yml index b22561b99de..0e5aa58a32a 100644 --- a/tests/licensedcode/data/datadriven/lic4/sun-bsd-no-nuclear_and_x11-tiff_and_unicode.txt.yml +++ b/tests/licensedcode/data/datadriven/lic4/sun-bsd-no-nuclear_and_x11-tiff_and_unicode.txt.yml @@ -1,4 +1,5 @@ license_expressions: + - other-permissive - bsd-3-clause-no-nuclear-warranty - bsd-3-clause-no-nuclear-warranty - x11-tiff diff --git a/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json b/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json index 14770de0f8c..63583c2979f 100644 --- a/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json +++ b/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json @@ -159,17 +159,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json b/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json index 9ffc8a5a9e2..2b48e0539ec 100644 --- a/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json +++ b/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json @@ -698,17 +698,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json b/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json index d8be6416f3b..4e15cfd4969 100644 --- a/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json +++ b/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json @@ -194,17 +194,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json b/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json index 6bedce2620c..5f98d72d7be 100644 --- a/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json +++ b/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json @@ -75,17 +75,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json b/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json index c6a3edb2548..e912115e6d4 100644 --- a/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json +++ b/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json @@ -229,17 +229,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json b/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json index 0d7230f2de4..7e9290aea83 100644 --- a/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json +++ b/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json @@ -537,17 +537,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json b/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json index 73fcf00aa66..77a817d2afe 100644 --- a/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json +++ b/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json @@ -614,17 +614,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json b/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json index 37c29af3759..d5a4897baea 100644 --- a/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json +++ b/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json @@ -103,17 +103,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json b/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json index 3f822949881..39797bd1573 100644 --- a/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json +++ b/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json @@ -124,17 +124,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json b/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json index 709db1fe57f..bd77356ebb4 100644 --- a/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json +++ b/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json @@ -82,13 +82,13 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" }, { @@ -118,7 +118,7 @@ "matched_text": " The license is the standard wording from the Apache license, but with\n Greg Luck as copyright\n owner." } ], - "identifier": "apache_2_0-b1634344-32cc-2997-3699-6c606f9bd980" + "identifier": "apache_2_0-c973d9ca-4048-3ccd-f7c7-c7e267fa7f3a" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json b/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json index c80365bacd1..18afe30c9b3 100644 --- a/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json +++ b/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json @@ -257,17 +257,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json b/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json index a64167ed341..c6d49d4f713 100644 --- a/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json +++ b/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json @@ -264,17 +264,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom.package.json b/tests/packagedcode/data/maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom.package.json index c80365bacd1..18afe30c9b3 100644 --- a/tests/packagedcode/data/maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom.package.json +++ b/tests/packagedcode/data/maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom.package.json @@ -257,17 +257,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/plugin/maven-package-expected.json b/tests/packagedcode/data/plugin/maven-package-expected.json index 41702a712c1..5c063963fa3 100644 --- a/tests/packagedcode/data/plugin/maven-package-expected.json +++ b/tests/packagedcode/data/plugin/maven-package-expected.json @@ -755,17 +755,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, @@ -7305,17 +7305,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, diff --git a/tests/packagedcode/data/plugin/maven-package-with-license-expected.json b/tests/packagedcode/data/plugin/maven-package-with-license-expected.json index 41702a712c1..5c063963fa3 100644 --- a/tests/packagedcode/data/plugin/maven-package-with-license-expected.json +++ b/tests/packagedcode/data/plugin/maven-package-with-license-expected.json @@ -755,17 +755,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null, @@ -7305,17 +7305,17 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "matched_length": 7, + "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", "license_expression": "apache-2.0", - "rule_identifier": "apache-2.0_5.RULE", + "rule_identifier": "apache-2.0_1316.RULE", "rule_relevance": 100, - "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE", "matched_text": "- name: The Apache Software License, Version 2.0" } ], - "identifier": "apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" + "identifier": "apache_2_0-c3b9cbd8-09fc-8aa5-f48b-917b9001c088" } ], "other_license_expression": null,