Skip to content

Commit c068276

Browse files
JonoYangJonoYang
authored
Merge pull request #142 from nexB/update-toolkit
Update scancode-toolkit to v32.0.6
2 parents 9cd5dbb + feb4a32 commit c068276

13 files changed

Lines changed: 115 additions & 234 deletions

‎minecode/tests/testfiles/cpan/expected_release_search.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -885,13 +885,13 @@
885885
"match_coverage":100.0,
886886
"matcher":"5-undetected",
887887
"license_expression":"unknown",
888-
"rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
888+
"rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
889889
"rule_relevance":100,
890-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
891-
"matched_text":"license ['unknown']"
890+
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
891+
"matched_text":"license - unknown"
892892
}
893893
],
894-
"identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9"
894+
"identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc"
895895
}
896896
],
897897
"other_license_expression":null,

‎minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -885,13 +885,13 @@
885885
"match_coverage":100.0,
886886
"matcher":"5-undetected",
887887
"license_expression":"unknown",
888-
"rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
888+
"rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
889889
"rule_relevance":100,
890-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
891-
"matched_text":"license ['unknown']"
890+
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
891+
"matched_text":"license - unknown"
892892
}
893893
],
894-
"identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9"
894+
"identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc"
895895
}
896896
],
897897
"other_license_expression":null,
@@ -1795,13 +1795,13 @@
17951795
"match_coverage":100.0,
17961796
"matcher":"5-undetected",
17971797
"license_expression":"unknown",
1798-
"rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
1798+
"rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
17991799
"rule_relevance":100,
1800-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
1801-
"matched_text":"license ['unknown']"
1800+
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
1801+
"matched_text":"license - unknown"
18021802
}
18031803
],
1804-
"identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9"
1804+
"identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc"
18051805
}
18061806
],
18071807
"other_license_expression":null,
@@ -1865,13 +1865,13 @@
18651865
"match_coverage":100.0,
18661866
"matcher":"5-undetected",
18671867
"license_expression":"unknown",
1868-
"rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
1868+
"rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
18691869
"rule_relevance":100,
1870-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
1871-
"matched_text":"license ['unknown']"
1870+
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
1871+
"matched_text":"license - unknown"
18721872
}
18731873
],
1874-
"identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9"
1874+
"identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc"
18751875
}
18761876
],
18771877
"other_license_expression":null,
@@ -1935,13 +1935,13 @@
19351935
"match_coverage":100.0,
19361936
"matcher":"5-undetected",
19371937
"license_expression":"unknown",
1938-
"rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
1938+
"rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
19391939
"rule_relevance":100,
1940-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
1941-
"matched_text":"license ['unknown']"
1940+
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
1941+
"matched_text":"license - unknown"
19421942
}
19431943
],
1944-
"identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9"
1944+
"identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc"
19451945
}
19461946
],
19471947
"other_license_expression":null,
@@ -2005,13 +2005,13 @@
20052005
"match_coverage":100.0,
20062006
"matcher":"5-undetected",
20072007
"license_expression":"unknown",
2008-
"rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
2008+
"rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
20092009
"rule_relevance":100,
2010-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
2011-
"matched_text":"license ['unknown']"
2010+
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
2011+
"matched_text":"license - unknown"
20122012
}
20132013
],
2014-
"identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9"
2014+
"identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc"
20152015
}
20162016
],
20172017
"other_license_expression":null,
@@ -2145,13 +2145,13 @@
21452145
"match_coverage":100.0,
21462146
"matcher":"5-undetected",
21472147
"license_expression":"unknown",
2148-
"rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
2148+
"rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
21492149
"rule_relevance":100,
2150-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
2151-
"matched_text":"license ['unknown']"
2150+
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
2151+
"matched_text":"license - unknown"
21522152
}
21532153
],
2154-
"identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9"
2154+
"identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc"
21552155
}
21562156
],
21572157
"other_license_expression":null,
@@ -2215,13 +2215,13 @@
22152215
"match_coverage":100.0,
22162216
"matcher":"5-undetected",
22172217
"license_expression":"unknown",
2218-
"rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
2218+
"rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
22192219
"rule_relevance":100,
2220-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
2221-
"matched_text":"license ['unknown']"
2220+
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
2221+
"matched_text":"license - unknown"
22222222
}
22232223
],
2224-
"identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9"
2224+
"identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc"
22252225
}
22262226
],
22272227
"other_license_expression":null,
@@ -2285,13 +2285,13 @@
22852285
"match_coverage":100.0,
22862286
"matcher":"5-undetected",
22872287
"license_expression":"unknown",
2288-
"rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
2288+
"rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
22892289
"rule_relevance":100,
2290-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
2291-
"matched_text":"license ['unknown']"
2290+
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
2291+
"matched_text":"license - unknown"
22922292
}
22932293
],
2294-
"identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9"
2294+
"identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc"
22952295
}
22962296
],
22972297
"other_license_expression":null,
@@ -2355,13 +2355,13 @@
23552355
"match_coverage":100.0,
23562356
"matcher":"5-undetected",
23572357
"license_expression":"unknown",
2358-
"rule_identifier":"package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
2358+
"rule_identifier":"package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
23592359
"rule_relevance":100,
2360-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-e24d5c1263c85e5f0b13888491e2d647fab9c05a",
2361-
"matched_text":"license ['unknown']"
2360+
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-60d25d9573996bcd1c02ac0df23ea095e03a886c",
2361+
"matched_text":"license - unknown"
23622362
}
23632363
],
2364-
"identifier":"unknown-0f1c7520-0a5e-131e-1fef-fe7e47e9d1b9"
2364+
"identifier":"unknown-6b0f0e5d-bddc-c231-45de-646115b29dbc"
23652365
}
23662366
],
23672367
"other_license_expression":null,

‎minecode/tests/testfiles/maven/end2end_unicode/expected_visited_commons-jaxrs-1.22.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
"last_map_date":true,
2222
"is_mappable":true,
2323
"has_map_error":true,
24-
"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"
24+
"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"
2525
}
2626
]

‎minecode/tests/testfiles/maven/mapper/axis-1.4.pom.package.json‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,43 +31,24 @@
3131
{
3232
"score":100.0,
3333
"start_line":1,
34-
"end_line":1,
35-
"matched_length":7,
34+
"end_line":2,
35+
"matched_length":18,
3636
"match_coverage":100.0,
3737
"matcher":"1-hash",
3838
"license_expression":"apache-2.0",
39-
"rule_identifier":"apache-2.0_5.RULE",
39+
"rule_identifier":"apache-2.0_40.RULE",
4040
"rule_relevance":100,
41-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_5.RULE",
42-
"matched_text":"The Apache Software License, Version 2.0"
41+
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
42+
"matched_text":"- name: The Apache Software License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt"
4343
}
4444
],
45-
"identifier":"apache_2_0-daaaee76-1395-c8c8-e06a-3f3f76e079b1"
46-
},
47-
{
48-
"license_expression":"apache-2.0",
49-
"matches":[
50-
{
51-
"score":80.0,
52-
"start_line":1,
53-
"end_line":1,
54-
"matched_length":9,
55-
"match_coverage":100.0,
56-
"matcher":"1-hash",
57-
"license_expression":"apache-2.0",
58-
"rule_identifier":"apache-2.0_42.RULE",
59-
"rule_relevance":80,
60-
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
61-
"matched_text":"http://www.apache.org/licenses/LICENSE-2.0.txt"
62-
}
63-
],
64-
"identifier":"apache_2_0-e6b67d43-b657-21c0-8d8b-17f617aef8ce"
45+
"identifier":"apache_2_0-bfa9e97a-62d3-0076-c881-8443e5e95192"
6546
}
6647
],
6748
"other_license_expression":null,
6849
"other_license_expression_spdx":null,
6950
"other_license_detections":[],
70-
"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",
51+
"extracted_license_statement":"- name: The Apache Software License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n",
7152
"notice_text":null,
7253
"source_packages":[
7354
"pkg:maven/axis/axis@1.4?classifier=sources"

‎minecode/tests/testfiles/maven/mapper/commons-jaxrs-1.21.pom.package.json‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,40 +77,34 @@
7777
"end_line":1,
7878
"matched_length":6,
7979
"match_coverage":100.0,
80-
"matcher":"1-hash",
80+
"matcher":"2-aho",
8181
"license_expression":"apache-2.0",
8282
"rule_identifier":"apache-2.0_182.RULE",
8383
"rule_relevance":100,
8484
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_182.RULE",
85-
"matched_text":"The Apache License, Version 2.0"
86-
}
87-
],
88-
"identifier":"apache_2_0-3b481945-ec95-7509-0433-96af863c23f8"
89-
},
90-
{
91-
"license_expression":"apache-2.0",
92-
"matches":[
85+
"matched_text":"- name: The Apache License, Version 2.0"
86+
},
9387
{
94-
"score":80.0,
95-
"start_line":1,
96-
"end_line":1,
88+
"score":100.0,
89+
"start_line":2,
90+
"end_line":2,
9791
"matched_length":9,
9892
"match_coverage":100.0,
99-
"matcher":"1-hash",
93+
"matcher":"2-aho",
10094
"license_expression":"apache-2.0",
10195
"rule_identifier":"apache-2.0_42.RULE",
102-
"rule_relevance":80,
96+
"rule_relevance":100,
10397
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
104-
"matched_text":"http://www.apache.org/licenses/LICENSE-2.0.txt"
98+
"matched_text":" url: http://www.apache.org/licenses/LICENSE-2.0.txt"
10599
}
106100
],
107-
"identifier":"apache_2_0-e6b67d43-b657-21c0-8d8b-17f617aef8ce"
101+
"identifier":"apache_2_0-e8c40f40-3205-ccee-fa1e-76154bd59d16"
108102
}
109103
],
110104
"other_license_expression":null,
111105
"other_license_expression_spdx":null,
112106
"other_license_detections":[],
113-
"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",
107+
"extracted_license_statement":"- name: The Apache License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n",
114108
"notice_text":null,
115109
"source_packages":[
116110
"pkg:maven/edu.psu.swe.commons/commons-jaxrs@1.21?classifier=sources"

‎minecode/tests/testfiles/maven/mapper/maven-all-1.0-RELEASE.pom.package.json‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,40 +42,34 @@
4242
"end_line":1,
4343
"matched_length":6,
4444
"match_coverage":100.0,
45-
"matcher":"1-hash",
45+
"matcher":"2-aho",
4646
"license_expression":"apache-2.0",
4747
"rule_identifier":"apache-2.0_182.RULE",
4848
"rule_relevance":100,
4949
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_182.RULE",
50-
"matched_text":"The Apache License, Version 2.0"
51-
}
52-
],
53-
"identifier":"apache_2_0-3b481945-ec95-7509-0433-96af863c23f8"
54-
},
55-
{
56-
"license_expression":"apache-2.0",
57-
"matches":[
50+
"matched_text":"- name: The Apache License, Version 2.0"
51+
},
5852
{
59-
"score":80.0,
60-
"start_line":1,
61-
"end_line":1,
53+
"score":100.0,
54+
"start_line":2,
55+
"end_line":2,
6256
"matched_length":9,
6357
"match_coverage":100.0,
64-
"matcher":"1-hash",
58+
"matcher":"2-aho",
6559
"license_expression":"apache-2.0",
6660
"rule_identifier":"apache-2.0_42.RULE",
67-
"rule_relevance":80,
61+
"rule_relevance":100,
6862
"rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
69-
"matched_text":"http://www.apache.org/licenses/LICENSE-2.0.txt"
63+
"matched_text":" url: http://www.apache.org/licenses/LICENSE-2.0.txt"
7064
}
7165
],
72-
"identifier":"apache_2_0-e6b67d43-b657-21c0-8d8b-17f617aef8ce"
66+
"identifier":"apache_2_0-e8c40f40-3205-ccee-fa1e-76154bd59d16"
7367
}
7468
],
7569
"other_license_expression":null,
7670
"other_license_expression_spdx":null,
7771
"other_license_detections":[],
78-
"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",
72+
"extracted_license_statement":"- name: The Apache License, Version 2.0\n url: http://www.apache.org/licenses/LICENSE-2.0.txt\n",
7973
"notice_text":null,
8074
"source_packages":[
8175
"pkg:maven/date.yetao.maven/maven-all@1.0-RELEASE?classifier=sources"

0 commit comments

Comments
 (0)