From feb4a32ec318f9ede30e4e9fdfdf6e990c664a24 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Wed, 12 Jul 2023 01:00:56 +0530 Subject: [PATCH] Update scancode-toolkit to v32.0.6 Update SCTK and regen test expectations. Signed-off-by: Ayan Sinha Mahapatra --- .../cpan/expected_release_search.json | 8 +-- ...pected_release_search_author_MIYAGAWA.json | 72 +++++++++---------- .../expected_visited_commons-jaxrs-1.22.json | 2 +- .../maven/mapper/axis-1.4.pom.package.json | 33 ++------- .../commons-jaxrs-1.21.pom.package.json | 28 +++----- .../maven-all-1.0-RELEASE.pom.package.json | 28 +++----- ...sql-connector-java-5.1.27.pom.package.json | 42 ++++------- .../common-object-1.0.2.pom.package.json | 33 ++------- .../empty/osgl-http-1.1.2.pom.package.json | 33 ++------- .../parse/jds-2.17.0718b.pom.package.json | 33 ++------- .../parsing/parse/jds-3.0.1.pom.package.json | 33 ++------- requirements.txt | 2 +- setup.cfg | 2 +- 13 files changed, 115 insertions(+), 234 deletions(-) diff --git a/minecode/tests/testfiles/cpan/expected_release_search.json b/minecode/tests/testfiles/cpan/expected_release_search.json index 7a2066ac..0acc19d9 100644 --- a/minecode/tests/testfiles/cpan/expected_release_search.json +++ b/minecode/tests/testfiles/cpan/expected_release_search.json @@ -885,13 +885,13 @@ "match_coverage":100.0, "matcher":"5-undetected", "license_expression":"unknown", - "rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", + "rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", - "matched_text":"license ['unknown']" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", + "matched_text":"license - unknown" } ], - "identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9" + "identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc" } ], "other_license_expression":null, diff --git a/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json b/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json index bf8fc928..b128510b 100644 --- a/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json +++ b/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json @@ -885,13 +885,13 @@ "match_coverage":100.0, "matcher":"5-undetected", "license_expression":"unknown", - "rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", + "rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", - "matched_text":"license ['unknown']" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", + "matched_text":"license - unknown" } ], - "identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9" + "identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc" } ], "other_license_expression":null, @@ -1795,13 +1795,13 @@ "match_coverage":100.0, "matcher":"5-undetected", "license_expression":"unknown", - "rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", + "rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", - "matched_text":"license ['unknown']" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", + "matched_text":"license - unknown" } ], - "identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9" + "identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc" } ], "other_license_expression":null, @@ -1865,13 +1865,13 @@ "match_coverage":100.0, "matcher":"5-undetected", "license_expression":"unknown", - "rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", + "rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", - "matched_text":"license ['unknown']" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", + "matched_text":"license - unknown" } ], - "identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9" + "identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc" } ], "other_license_expression":null, @@ -1935,13 +1935,13 @@ "match_coverage":100.0, "matcher":"5-undetected", "license_expression":"unknown", - "rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", + "rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", - "matched_text":"license ['unknown']" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", + "matched_text":"license - unknown" } ], - "identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9" + "identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc" } ], "other_license_expression":null, @@ -2005,13 +2005,13 @@ "match_coverage":100.0, "matcher":"5-undetected", "license_expression":"unknown", - "rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", + "rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", - "matched_text":"license ['unknown']" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", + "matched_text":"license - unknown" } ], - "identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9" + "identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc" } ], "other_license_expression":null, @@ -2145,13 +2145,13 @@ "match_coverage":100.0, "matcher":"5-undetected", "license_expression":"unknown", - "rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", + "rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", - "matched_text":"license ['unknown']" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", + "matched_text":"license - unknown" } ], - "identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9" + "identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc" } ], "other_license_expression":null, @@ -2215,13 +2215,13 @@ "match_coverage":100.0, "matcher":"5-undetected", "license_expression":"unknown", - "rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", + "rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", - "matched_text":"license ['unknown']" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", + "matched_text":"license - unknown" } ], - "identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9" + "identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc" } ], "other_license_expression":null, @@ -2285,13 +2285,13 @@ "match_coverage":100.0, "matcher":"5-undetected", "license_expression":"unknown", - "rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", + "rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", - "matched_text":"license ['unknown']" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", + "matched_text":"license - unknown" } ], - "identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9" + "identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc" } ], "other_license_expression":null, @@ -2355,13 +2355,13 @@ "match_coverage":100.0, "matcher":"5-undetected", "license_expression":"unknown", - "rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", + "rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a", - "matched_text":"license ['unknown']" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c", + "matched_text":"license - unknown" } ], - "identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9" + "identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc" } ], "other_license_expression":null, diff --git a/minecode/tests/testfiles/maven/end2end_unicode/expected_visited_commons-jaxrs-1.22.json b/minecode/tests/testfiles/maven/end2end_unicode/expected_visited_commons-jaxrs-1.22.json index f9a6e48f..51933a3f 100644 --- a/minecode/tests/testfiles/maven/end2end_unicode/expected_visited_commons-jaxrs-1.22.json +++ b/minecode/tests/testfiles/maven/end2end_unicode/expected_visited_commons-jaxrs-1.22.json @@ -21,6 +21,6 @@ "last_map_date":true, "is_mappable":true, "has_map_error":true, - "map_error":"No download_url for package:PackageData(type='maven', namespace='edu.psu.swe.commons', name='commons-jaxrs', version='1.22', datasource_id='maven_pom')\n" + "map_error":"No download_url for package:MavenPackageData(type='maven', namespace='edu.psu.swe.commons', name='commons-jaxrs', version='1.22', datasource_id='maven_pom')\n" } ] \ No newline at end of file diff --git a/minecode/tests/testfiles/maven/mapper/axis-1.4.pom.package.json b/minecode/tests/testfiles/maven/mapper/axis-1.4.pom.package.json index bd188663..a00d2f88 100644 --- a/minecode/tests/testfiles/maven/mapper/axis-1.4.pom.package.json +++ b/minecode/tests/testfiles/maven/mapper/axis-1.4.pom.package.json @@ -31,43 +31,24 @@ { "score":100.0, "start_line":1, - "end_line":1, - "matched_length":7, + "end_line":2, + "matched_length":18, "match_coverage":100.0, "matcher":"1-hash", "license_expression":"apache-2.0", - "rule_identifier":"apache-2.0_5.RULE", + "rule_identifier":"apache-2.0_40.RULE", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", - "matched_text":"The Apache Software License, Version 2.0" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE", + "matched_text":"- name: The Apache Software License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt" } ], - "identifier":"apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" - }, - { - "license_expression":"apache-2.0", - "matches":[ - { - "score":80.0, - "start_line":1, - "end_line":1, - "matched_length":9, - "match_coverage":100.0, - "matcher":"1-hash", - "license_expression":"apache-2.0", - "rule_identifier":"apache-2.0_42.RULE", - "rule_relevance":80, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE", - "matched_text":"http://www.apache.org/licenses/LICENSE-2.0.txt" - } - ], - "identifier":"apache_2_0-e6b67d43-b657-21c0-8d8b-17f617aef8ce" + "identifier":"apache_2_0-bfa9e97a-62d3-0076-c881-8443e5e95192" } ], "other_license_expression":null, "other_license_expression_spdx":null, "other_license_detections":[], - "extracted_license_statement":"- name: The Apache Software License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n comments:\n distribution: repo\n", + "extracted_license_statement":"- name: The Apache Software License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n", "notice_text":null, "source_packages":[ "pkg:maven/axis/axis@1.4?classifier=sources" diff --git a/minecode/tests/testfiles/maven/mapper/commons-jaxrs-1.21.pom.package.json b/minecode/tests/testfiles/maven/mapper/commons-jaxrs-1.21.pom.package.json index 2d02a1b8..cb704ae7 100644 --- a/minecode/tests/testfiles/maven/mapper/commons-jaxrs-1.21.pom.package.json +++ b/minecode/tests/testfiles/maven/mapper/commons-jaxrs-1.21.pom.package.json @@ -77,40 +77,34 @@ "end_line":1, "matched_length":6, "match_coverage":100.0, - "matcher":"1-hash", + "matcher":"2-aho", "license_expression":"apache-2.0", "rule_identifier":"apache-2.0_182.RULE", "rule_relevance":100, "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_182.RULE", - "matched_text":"The Apache License, Version 2.0" - } - ], - "identifier":"apache_2_0-3b481945-ec95-7509-0433-96af863c23f8" - }, - { - "license_expression":"apache-2.0", - "matches":[ + "matched_text":"- name: The Apache License, Version 2.0" + }, { - "score":80.0, - "start_line":1, - "end_line":1, + "score":100.0, + "start_line":2, + "end_line":2, "matched_length":9, "match_coverage":100.0, - "matcher":"1-hash", + "matcher":"2-aho", "license_expression":"apache-2.0", "rule_identifier":"apache-2.0_42.RULE", - "rule_relevance":80, + "rule_relevance":100, "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE", - "matched_text":"http://www.apache.org/licenses/LICENSE-2.0.txt" + "matched_text":" url: http://www.apache.org/licenses/LICENSE-2.0.txt" } ], - "identifier":"apache_2_0-e6b67d43-b657-21c0-8d8b-17f617aef8ce" + "identifier":"apache_2_0-e8c40f40-3205-ccee-fa1e-76154bd59d16" } ], "other_license_expression":null, "other_license_expression_spdx":null, "other_license_detections":[], - "extracted_license_statement":"- name: The Apache License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n comments:\n distribution:\n", + "extracted_license_statement":"- name: The Apache License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n", "notice_text":null, "source_packages":[ "pkg:maven/edu.psu.swe.commons/commons-jaxrs@1.21?classifier=sources" diff --git a/minecode/tests/testfiles/maven/mapper/maven-all-1.0-RELEASE.pom.package.json b/minecode/tests/testfiles/maven/mapper/maven-all-1.0-RELEASE.pom.package.json index 70c76b3c..5d6b72d4 100644 --- a/minecode/tests/testfiles/maven/mapper/maven-all-1.0-RELEASE.pom.package.json +++ b/minecode/tests/testfiles/maven/mapper/maven-all-1.0-RELEASE.pom.package.json @@ -42,40 +42,34 @@ "end_line":1, "matched_length":6, "match_coverage":100.0, - "matcher":"1-hash", + "matcher":"2-aho", "license_expression":"apache-2.0", "rule_identifier":"apache-2.0_182.RULE", "rule_relevance":100, "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_182.RULE", - "matched_text":"The Apache License, Version 2.0" - } - ], - "identifier":"apache_2_0-3b481945-ec95-7509-0433-96af863c23f8" - }, - { - "license_expression":"apache-2.0", - "matches":[ + "matched_text":"- name: The Apache License, Version 2.0" + }, { - "score":80.0, - "start_line":1, - "end_line":1, + "score":100.0, + "start_line":2, + "end_line":2, "matched_length":9, "match_coverage":100.0, - "matcher":"1-hash", + "matcher":"2-aho", "license_expression":"apache-2.0", "rule_identifier":"apache-2.0_42.RULE", - "rule_relevance":80, + "rule_relevance":100, "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE", - "matched_text":"http://www.apache.org/licenses/LICENSE-2.0.txt" + "matched_text":" url: http://www.apache.org/licenses/LICENSE-2.0.txt" } ], - "identifier":"apache_2_0-e6b67d43-b657-21c0-8d8b-17f617aef8ce" + "identifier":"apache_2_0-e8c40f40-3205-ccee-fa1e-76154bd59d16" } ], "other_license_expression":null, "other_license_expression_spdx":null, "other_license_detections":[], - "extracted_license_statement":"- name: The Apache License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n comments:\n distribution:\n", + "extracted_license_statement":"- name: The Apache License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n", "notice_text":null, "source_packages":[ "pkg:maven/date.yetao.maven/maven-all@1.0-RELEASE?classifier=sources" diff --git a/minecode/tests/testfiles/maven/mapper/mysql-connector-java-5.1.27.pom.package.json b/minecode/tests/testfiles/maven/mapper/mysql-connector-java-5.1.27.pom.package.json index 7ac93527..66368c66 100644 --- a/minecode/tests/testfiles/maven/mapper/mysql-connector-java-5.1.27.pom.package.json +++ b/minecode/tests/testfiles/maven/mapper/mysql-connector-java-5.1.27.pom.package.json @@ -34,7 +34,7 @@ "declared_license_expression_spdx":"GPL-2.0-only AND GPL-2.0-only WITH LicenseRef-scancode-mysql-linking-exception-2018", "license_detections":[ { - "license_expression":"gpl-2.0", + "license_expression":"gpl-2.0 AND gpl-2.0 WITH mysql-linking-exception-2018", "matches":[ { "score":100.0, @@ -42,59 +42,47 @@ "end_line":1, "matched_length":7, "match_coverage":100.0, - "matcher":"1-hash", + "matcher":"2-aho", "license_expression":"gpl-2.0", "rule_identifier":"gpl-2.0_660.RULE", "rule_relevance":100, "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_660.RULE", - "matched_text":"The GNU General Public License, Version 2" - } - ], - "identifier":"gpl_2_0-e4d948a1-2b6e-11d4-b4dd-3231d54498a5" - }, - { - "license_expression":"gpl-2.0", - "matches":[ + "matched_text":"- name: The GNU General Public License, Version 2" + }, { "score":100.0, - "start_line":1, - "end_line":1, + "start_line":2, + "end_line":2, "matched_length":11, "match_coverage":100.0, - "matcher":"1-hash", + "matcher":"2-aho", "license_expression":"gpl-2.0", "rule_identifier":"gpl-2.0_78.RULE", "rule_relevance":100, "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_78.RULE", - "matched_text":"http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" - } - ], - "identifier":"gpl_2_0-935c1671-307f-e0fe-aa30-0b2457880ee6" - }, - { - "license_expression":"gpl-2.0 WITH mysql-linking-exception-2018", - "matches":[ + "matched_text":" url: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" + }, { "score":100.0, - "start_line":1, - "end_line":3, + "start_line":4, + "end_line":6, "matched_length":32, "match_coverage":100.0, - "matcher":"1-hash", + "matcher":"2-aho", "license_expression":"gpl-2.0 WITH mysql-linking-exception-2018", "rule_identifier":"gpl-2.0_with_mysql-linking-exception-2018_4.RULE", "rule_relevance":100, "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_with_mysql-linking-exception-2018_4.RULE", - "matched_text":"MySQL Connector/J contains exceptions to GPL requirements when linking with other components\nthat are licensed under OSI-approved open source licenses, see EXCEPTIONS-CONNECTOR-J\nin this distribution for more details." + "matched_text":" MySQL Connector/J contains exceptions to GPL requirements when linking with other components\n that are licensed under OSI-approved open source licenses, see EXCEPTIONS-CONNECTOR-J\n in this distribution for more details." } ], - "identifier":"gpl_2_0_with_mysql_linking_exception_2018-f0b93e99-a8d2-bae8-47b2-7adfca08d745" + "identifier":"gpl_2_0_and_gpl_2_0_with_mysql_linking_exception_2018-0cd7a411-f08b-91fd-75be-37baafbb81a9" } ], "other_license_expression":null, "other_license_expression_spdx":null, "other_license_detections":[], - "extracted_license_statement":"- name: The GNU General Public License, Version 2\n url: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html\n comments: |\n MySQL Connector/J contains exceptions to GPL requirements when linking with other components\n that are licensed under OSI-approved open source licenses, see EXCEPTIONS-CONNECTOR-J\n in this distribution for more details.\n distribution: repo\n", + "extracted_license_statement":"- name: The GNU General Public License, Version 2\n url: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html\n comments: |\n MySQL Connector/J contains exceptions to GPL requirements when linking with other components\n that are licensed under OSI-approved open source licenses, see EXCEPTIONS-CONNECTOR-J\n in this distribution for more details.\n", "notice_text":null, "source_packages":[ "pkg:maven/mysql/mysql-connector-java@5.1.27?classifier=sources" diff --git a/minecode/tests/testfiles/maven/parsing/empty/common-object-1.0.2.pom.package.json b/minecode/tests/testfiles/maven/parsing/empty/common-object-1.0.2.pom.package.json index cb5ec335..ef719021 100644 --- a/minecode/tests/testfiles/maven/parsing/empty/common-object-1.0.2.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/empty/common-object-1.0.2.pom.package.json @@ -39,43 +39,24 @@ { "score":100.0, "start_line":1, - "end_line":1, - "matched_length":7, + "end_line":2, + "matched_length":18, "match_coverage":100.0, "matcher":"1-hash", "license_expression":"apache-2.0", - "rule_identifier":"apache-2.0_5.RULE", + "rule_identifier":"apache-2.0_40.RULE", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", - "matched_text":"The Apache Software License, Version 2.0" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE", + "matched_text":"- name: The Apache Software License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt" } ], - "identifier":"apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" - }, - { - "license_expression":"apache-2.0", - "matches":[ - { - "score":80.0, - "start_line":1, - "end_line":1, - "matched_length":9, - "match_coverage":100.0, - "matcher":"1-hash", - "license_expression":"apache-2.0", - "rule_identifier":"apache-2.0_42.RULE", - "rule_relevance":80, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE", - "matched_text":"http://www.apache.org/licenses/LICENSE-2.0.txt" - } - ], - "identifier":"apache_2_0-e6b67d43-b657-21c0-8d8b-17f617aef8ce" + "identifier":"apache_2_0-bfa9e97a-62d3-0076-c881-8443e5e95192" } ], "other_license_expression":null, "other_license_expression_spdx":null, "other_license_detections":[], - "extracted_license_statement":"- name: The Apache Software License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n comments:\n distribution:\n", + "extracted_license_statement":"- name: The Apache Software License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n", "notice_text":null, "source_packages":[ "pkg:maven/org.xson/common-object@1.0.2?classifier=sources" diff --git a/minecode/tests/testfiles/maven/parsing/empty/osgl-http-1.1.2.pom.package.json b/minecode/tests/testfiles/maven/parsing/empty/osgl-http-1.1.2.pom.package.json index bcb556c5..4e7618f2 100644 --- a/minecode/tests/testfiles/maven/parsing/empty/osgl-http-1.1.2.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/empty/osgl-http-1.1.2.pom.package.json @@ -31,43 +31,24 @@ { "score":100.0, "start_line":1, - "end_line":1, - "matched_length":7, + "end_line":2, + "matched_length":18, "match_coverage":100.0, "matcher":"1-hash", "license_expression":"apache-2.0", - "rule_identifier":"apache-2.0_5.RULE", + "rule_identifier":"apache-2.0_40.RULE", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE", - "matched_text":"The Apache Software License, Version 2.0" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE", + "matched_text":"- name: The Apache Software License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt" } ], - "identifier":"apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1" - }, - { - "license_expression":"apache-2.0", - "matches":[ - { - "score":80.0, - "start_line":1, - "end_line":1, - "matched_length":9, - "match_coverage":100.0, - "matcher":"1-hash", - "license_expression":"apache-2.0", - "rule_identifier":"apache-2.0_42.RULE", - "rule_relevance":80, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE", - "matched_text":"http://www.apache.org/licenses/LICENSE-2.0.txt" - } - ], - "identifier":"apache_2_0-e6b67d43-b657-21c0-8d8b-17f617aef8ce" + "identifier":"apache_2_0-bfa9e97a-62d3-0076-c881-8443e5e95192" } ], "other_license_expression":null, "other_license_expression_spdx":null, "other_license_detections":[], - "extracted_license_statement":"- name: The Apache Software License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n comments:\n distribution: repo\n", + "extracted_license_statement":"- name: The Apache Software License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n", "notice_text":null, "source_packages":[ "pkg:maven/org.osgl/osgl-http@1.1.2?classifier=sources" diff --git a/minecode/tests/testfiles/maven/parsing/parse/jds-2.17.0718b.pom.package.json b/minecode/tests/testfiles/maven/parsing/parse/jds-2.17.0718b.pom.package.json index f77c232f..7423f720 100644 --- a/minecode/tests/testfiles/maven/parsing/parse/jds-2.17.0718b.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/parse/jds-2.17.0718b.pom.package.json @@ -39,43 +39,24 @@ { "score":100.0, "start_line":1, - "end_line":1, - "matched_length":5, + "end_line":2, + "matched_length":14, "match_coverage":100.0, "matcher":"1-hash", "license_expression":"bsd-new", - "rule_identifier":"bsd-new_357.RULE", + "rule_identifier":"bsd-new_358.RULE", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_357.RULE", - "matched_text":"The 3-Clause BSD License" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_358.RULE", + "matched_text":"- name: The 3-Clause BSD License\n url: https://opensource.org/licenses/BSD-3-Clause" } ], - "identifier":"bsd_new-4a9d3cf0-ff09-5016-1803-17b6319e005b" - }, - { - "license_expression":"bsd-new", - "matches":[ - { - "score":100.0, - "start_line":1, - "end_line":1, - "matched_length":7, - "match_coverage":100.0, - "matcher":"1-hash", - "license_expression":"bsd-new", - "rule_identifier":"bsd-new_356.RULE", - "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_356.RULE", - "matched_text":"https://opensource.org/licenses/BSD-3-Clause" - } - ], - "identifier":"bsd_new-258b6fd3-b429-125a-31cb-35d6ddac32c5" + "identifier":"bsd_new-16562f16-7bf2-63a5-7b03-5327f109350b" } ], "other_license_expression":null, "other_license_expression_spdx":null, "other_license_detections":[], - "extracted_license_statement":"- name: The 3-Clause BSD License\n url: https://opensource.org/licenses/BSD-3-Clause\n comments:\n distribution:\n", + "extracted_license_statement":"- name: The 3-Clause BSD License\n url: https://opensource.org/licenses/BSD-3-Clause\n", "notice_text":null, "source_packages":[ "pkg:maven/io.github.subiyacryolite/jds@2.17.0718b?classifier=sources" diff --git a/minecode/tests/testfiles/maven/parsing/parse/jds-3.0.1.pom.package.json b/minecode/tests/testfiles/maven/parsing/parse/jds-3.0.1.pom.package.json index 5c722f79..441cd825 100644 --- a/minecode/tests/testfiles/maven/parsing/parse/jds-3.0.1.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/parse/jds-3.0.1.pom.package.json @@ -39,43 +39,24 @@ { "score":100.0, "start_line":1, - "end_line":1, - "matched_length":5, + "end_line":2, + "matched_length":14, "match_coverage":100.0, "matcher":"1-hash", "license_expression":"bsd-new", - "rule_identifier":"bsd-new_357.RULE", + "rule_identifier":"bsd-new_358.RULE", "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_357.RULE", - "matched_text":"The 3-Clause BSD License" + "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_358.RULE", + "matched_text":"- name: The 3-Clause BSD License\n url: https://opensource.org/licenses/BSD-3-Clause" } ], - "identifier":"bsd_new-4a9d3cf0-ff09-5016-1803-17b6319e005b" - }, - { - "license_expression":"bsd-new", - "matches":[ - { - "score":100.0, - "start_line":1, - "end_line":1, - "matched_length":7, - "match_coverage":100.0, - "matcher":"1-hash", - "license_expression":"bsd-new", - "rule_identifier":"bsd-new_356.RULE", - "rule_relevance":100, - "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_356.RULE", - "matched_text":"https://opensource.org/licenses/BSD-3-Clause" - } - ], - "identifier":"bsd_new-258b6fd3-b429-125a-31cb-35d6ddac32c5" + "identifier":"bsd_new-16562f16-7bf2-63a5-7b03-5327f109350b" } ], "other_license_expression":null, "other_license_expression_spdx":null, "other_license_detections":[], - "extracted_license_statement":"- name: The 3-Clause BSD License\n url: https://opensource.org/licenses/BSD-3-Clause\n comments:\n distribution:\n", + "extracted_license_statement":"- name: The 3-Clause BSD License\n url: https://opensource.org/licenses/BSD-3-Clause\n", "notice_text":null, "source_packages":[ "pkg:maven/io.github.subiyacryolite/jds@3.0.1?classifier=sources" diff --git a/requirements.txt b/requirements.txt index 35b86478..85063df3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -80,7 +80,7 @@ reppy2==0.3.6 requests==2.31.0 rubymarshal==1.0.3 saneyaml==0.6.0 -scancode-toolkit==32.0.1 +scancode-toolkit==32.0.6 setuptools==65.3.0 six==1.16.0 soupsieve==2.4.1 diff --git a/setup.cfg b/setup.cfg index 12485874..0cb9e191 100644 --- a/setup.cfg +++ b/setup.cfg @@ -53,7 +53,7 @@ install_requires = PyGithub == 1.56 reppy2 == 0.3.6 rubymarshal == 1.0.3 - scancode-toolkit[full] == 32.0.1 + scancode-toolkit[full] == 32.0.6 urlpy == 0.5 matchcode-toolkit == 1.1.1 setup_requires = setuptools_scm[toml] >= 4