Skip to content

Commit

Permalink
Update scancode-toolkit to v32.0.6
Browse files Browse the repository at this point in the history 
Update SCTK and regen test expectations.

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
  • Loading branch information
@AyanSinhaMahapatra
AyanSinhaMahapatra committed Jul 13, 2023
1 parent 9cd5dbb commit feb4a32
Show file tree
Hide file tree
Showing 13 changed files with 115 additions and 234 deletions.
8 changes: 4 additions & 4 deletions minecode/tests/testfiles/cpan/expected_release_search.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
72 changes: 36 additions & 36 deletions minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion minecode/tests/testfiles/maven/end2end_unicode/expected_visited_commons-jaxrs-1.22.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
33 changes: 7 additions & 26 deletions minecode/tests/testfiles/maven/mapper/axis-1.4.pom.package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
28 changes: 11 additions & 17 deletions minecode/tests/testfiles/maven/mapper/commons-jaxrs-1.21.pom.package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
28 changes: 11 additions & 17 deletions minecode/tests/testfiles/maven/mapper/maven-all-1.0-RELEASE.pom.package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit feb4a32

Please sign in to comment.