Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly assign boolean to is_resolved #3152 #3153

Merged
merged 3 commits into from
Jan 17, 2023
Merged

Properly assign boolean to is_resolved #3152 #3153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c24c221
Properly assign boolean to is_resolved #3152
JonoYang Nov 19, 2022
4ce06b3
Update test expectations #3152
JonoYang Nov 21, 2022
81ed761
Merge branch 'develop' into 3152-maven-pom-dep-assign-is_resolved
AyanSinhaMahapatra Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/packagedcode/maven.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ def get_dependencies(pom):
if dversion == 'latest.release':
dversion = None

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

dqualifiers = {}
# FIXME: this is missing from the original Pom parser
Expand Down
44 changes: 22 additions & 22 deletions ...kagedcode/data/license_detection/license-as-manifest-comment/activemq-camel.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"scope": "compile",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {},
"dependency_uid": "pkg:maven/commons-logging/commons-logging-api?uuid=fixed-uid-done-for-testing-5642512d1758",
Expand All @@ -90,7 +90,7 @@
"scope": "compile",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {},
"dependency_uid": "pkg:maven/org.apache.camel/camel-jms?uuid=fixed-uid-done-for-testing-5642512d1758",
Expand All @@ -104,7 +104,7 @@
"scope": "compile",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {},
"dependency_uid": "pkg:maven/org.apache.activemq/activemq-core?uuid=fixed-uid-done-for-testing-5642512d1758",
Expand All @@ -118,7 +118,7 @@
"scope": "compile",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {},
"dependency_uid": "pkg:maven/org.apache.activemq/activemq-pool?uuid=fixed-uid-done-for-testing-5642512d1758",
Expand All @@ -132,7 +132,7 @@
"scope": "compile",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {},
"dependency_uid": "pkg:maven/org.apache.geronimo.specs/geronimo-annotation_1.0_spec?uuid=fixed-uid-done-for-testing-5642512d1758",
Expand All @@ -146,7 +146,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {},
"dependency_uid": "pkg:maven/org.apache.activemq/activemq-core?uuid=fixed-uid-done-for-testing-5642512d1758",
Expand All @@ -160,7 +160,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {},
"dependency_uid": "pkg:maven/org.apache.camel/camel-core?uuid=fixed-uid-done-for-testing-5642512d1758",
Expand All @@ -174,7 +174,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {},
"dependency_uid": "pkg:maven/org.apache.camel/camel-spring?uuid=fixed-uid-done-for-testing-5642512d1758",
Expand All @@ -188,7 +188,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {},
"dependency_uid": "pkg:maven/org.springframework/spring-test?uuid=fixed-uid-done-for-testing-5642512d1758",
Expand All @@ -202,7 +202,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {},
"dependency_uid": "pkg:maven/junit/junit?uuid=fixed-uid-done-for-testing-5642512d1758",
Expand All @@ -216,7 +216,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {},
"dependency_uid": "pkg:maven/org.hamcrest/hamcrest-all?uuid=fixed-uid-done-for-testing-5642512d1758",
Expand Down Expand Up @@ -396,7 +396,7 @@
"scope": "compile",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {}
},
Expand All @@ -406,7 +406,7 @@
"scope": "compile",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {}
},
Expand All @@ -416,7 +416,7 @@
"scope": "compile",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {}
},
Expand All @@ -426,7 +426,7 @@
"scope": "compile",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {}
},
Expand All @@ -436,7 +436,7 @@
"scope": "compile",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {}
},
Expand All @@ -446,7 +446,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {}
},
Expand All @@ -456,7 +456,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {}
},
Expand All @@ -466,7 +466,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {}
},
Expand All @@ -476,7 +476,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {}
},
Expand All @@ -486,7 +486,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {}
},
Expand All @@ -496,7 +496,7 @@
"scope": "test",
"is_runtime": false,
"is_optional": true,
"is_resolved": null,
"is_resolved": false,
"resolved_package": {},
"extra_data": {}
}
Expand Down
Loading