Skip to content

Commit cc14890

Browse files
pombredannepombredanne
authored
Merge pull request #3153 from nexB/3152-maven-pom-dep-assign-is_resolved
Properly assign boolean to is_resolved #3152
2 parents fca6f82 + 81ed761 commit cc14890

File tree

120 files changed

+734
-440
lines changed

Some content is hidden

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

120 files changed

+734
-440
lines changed

‎src/packagedcode/maven.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ def get_dependencies(pom):
895895
if dversion == 'latest.release':
896896
dversion = None
897897

898-
is_resolved = dversion and not any(c in dversion for c in '$[,]')
898+
is_resolved = bool(dversion and not any(c in dversion for c in '$[,]'))
899899

900900
dqualifiers = {}
901901
# FIXME: this is missing from the original Pom parser

‎tests/packagedcode/data/license_detection/license-as-manifest-comment/activemq-camel.expected.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"scope": "compile",
7777
"is_runtime": false,
7878
"is_optional": true,
79-
"is_resolved": null,
79+
"is_resolved": false,
8080
"resolved_package": {},
8181
"extra_data": {},
8282
"dependency_uid": "pkg:maven/commons-logging/commons-logging-api?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -90,7 +90,7 @@
9090
"scope": "compile",
9191
"is_runtime": false,
9292
"is_optional": true,
93-
"is_resolved": null,
93+
"is_resolved": false,
9494
"resolved_package": {},
9595
"extra_data": {},
9696
"dependency_uid": "pkg:maven/org.apache.camel/camel-jms?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -104,7 +104,7 @@
104104
"scope": "compile",
105105
"is_runtime": false,
106106
"is_optional": true,
107-
"is_resolved": null,
107+
"is_resolved": false,
108108
"resolved_package": {},
109109
"extra_data": {},
110110
"dependency_uid": "pkg:maven/org.apache.activemq/activemq-core?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -118,7 +118,7 @@
118118
"scope": "compile",
119119
"is_runtime": false,
120120
"is_optional": true,
121-
"is_resolved": null,
121+
"is_resolved": false,
122122
"resolved_package": {},
123123
"extra_data": {},
124124
"dependency_uid": "pkg:maven/org.apache.activemq/activemq-pool?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -132,7 +132,7 @@
132132
"scope": "compile",
133133
"is_runtime": false,
134134
"is_optional": true,
135-
"is_resolved": null,
135+
"is_resolved": false,
136136
"resolved_package": {},
137137
"extra_data": {},
138138
"dependency_uid": "pkg:maven/org.apache.geronimo.specs/geronimo-annotation_1.0_spec?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -146,7 +146,7 @@
146146
"scope": "test",
147147
"is_runtime": false,
148148
"is_optional": true,
149-
"is_resolved": null,
149+
"is_resolved": false,
150150
"resolved_package": {},
151151
"extra_data": {},
152152
"dependency_uid": "pkg:maven/org.apache.activemq/activemq-core?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -160,7 +160,7 @@
160160
"scope": "test",
161161
"is_runtime": false,
162162
"is_optional": true,
163-
"is_resolved": null,
163+
"is_resolved": false,
164164
"resolved_package": {},
165165
"extra_data": {},
166166
"dependency_uid": "pkg:maven/org.apache.camel/camel-core?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -174,7 +174,7 @@
174174
"scope": "test",
175175
"is_runtime": false,
176176
"is_optional": true,
177-
"is_resolved": null,
177+
"is_resolved": false,
178178
"resolved_package": {},
179179
"extra_data": {},
180180
"dependency_uid": "pkg:maven/org.apache.camel/camel-spring?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -188,7 +188,7 @@
188188
"scope": "test",
189189
"is_runtime": false,
190190
"is_optional": true,
191-
"is_resolved": null,
191+
"is_resolved": false,
192192
"resolved_package": {},
193193
"extra_data": {},
194194
"dependency_uid": "pkg:maven/org.springframework/spring-test?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -202,7 +202,7 @@
202202
"scope": "test",
203203
"is_runtime": false,
204204
"is_optional": true,
205-
"is_resolved": null,
205+
"is_resolved": false,
206206
"resolved_package": {},
207207
"extra_data": {},
208208
"dependency_uid": "pkg:maven/junit/junit?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -216,7 +216,7 @@
216216
"scope": "test",
217217
"is_runtime": false,
218218
"is_optional": true,
219-
"is_resolved": null,
219+
"is_resolved": false,
220220
"resolved_package": {},
221221
"extra_data": {},
222222
"dependency_uid": "pkg:maven/org.hamcrest/hamcrest-all?uuid=fixed-uid-done-for-testing-5642512d1758",
@@ -396,7 +396,7 @@
396396
"scope": "compile",
397397
"is_runtime": false,
398398
"is_optional": true,
399-
"is_resolved": null,
399+
"is_resolved": false,
400400
"resolved_package": {},
401401
"extra_data": {}
402402
},
@@ -406,7 +406,7 @@
406406
"scope": "compile",
407407
"is_runtime": false,
408408
"is_optional": true,
409-
"is_resolved": null,
409+
"is_resolved": false,
410410
"resolved_package": {},
411411
"extra_data": {}
412412
},
@@ -416,7 +416,7 @@
416416
"scope": "compile",
417417
"is_runtime": false,
418418
"is_optional": true,
419-
"is_resolved": null,
419+
"is_resolved": false,
420420
"resolved_package": {},
421421
"extra_data": {}
422422
},
@@ -426,7 +426,7 @@
426426
"scope": "compile",
427427
"is_runtime": false,
428428
"is_optional": true,
429-
"is_resolved": null,
429+
"is_resolved": false,
430430
"resolved_package": {},
431431
"extra_data": {}
432432
},
@@ -436,7 +436,7 @@
436436
"scope": "compile",
437437
"is_runtime": false,
438438
"is_optional": true,
439-
"is_resolved": null,
439+
"is_resolved": false,
440440
"resolved_package": {},
441441
"extra_data": {}
442442
},
@@ -446,7 +446,7 @@
446446
"scope": "test",
447447
"is_runtime": false,
448448
"is_optional": true,
449-
"is_resolved": null,
449+
"is_resolved": false,
450450
"resolved_package": {},
451451
"extra_data": {}
452452
},
@@ -456,7 +456,7 @@
456456
"scope": "test",
457457
"is_runtime": false,
458458
"is_optional": true,
459-
"is_resolved": null,
459+
"is_resolved": false,
460460
"resolved_package": {},
461461
"extra_data": {}
462462
},
@@ -466,7 +466,7 @@
466466
"scope": "test",
467467
"is_runtime": false,
468468
"is_optional": true,
469-
"is_resolved": null,
469+
"is_resolved": false,
470470
"resolved_package": {},
471471
"extra_data": {}
472472
},
@@ -476,7 +476,7 @@
476476
"scope": "test",
477477
"is_runtime": false,
478478
"is_optional": true,
479-
"is_resolved": null,
479+
"is_resolved": false,
480480
"resolved_package": {},
481481
"extra_data": {}
482482
},
@@ -486,7 +486,7 @@
486486
"scope": "test",
487487
"is_runtime": false,
488488
"is_optional": true,
489-
"is_resolved": null,
489+
"is_resolved": false,
490490
"resolved_package": {},
491491
"extra_data": {}
492492
},
@@ -496,7 +496,7 @@
496496
"scope": "test",
497497
"is_runtime": false,
498498
"is_optional": true,
499-
"is_resolved": null,
499+
"is_resolved": false,
500500
"resolved_package": {},
501501
"extra_data": {}
502502
}

0 commit comments

Comments
 (0)