Merge pull request #3153 from nexB/3152-maven-pom-dep-assign-is_resolved

Properly assign boolean to is_resolved #3152
aboutcode-org · Jan 17, 2023 · cc14890 · cc14890
2 parents fca6f82 + 81ed761
commit cc14890
Show file tree

Hide file tree

Showing 120 changed files with 734 additions and 440 deletions.
diff --git a/src/packagedcode/maven.py b/src/packagedcode/maven.py
@@ -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

diff --git a/...kagedcode/data/license_detection/license-as-manifest-comment/activemq-camel.expected.json b/...kagedcode/data/license_detection/license-as-manifest-comment/activemq-camel.expected.json
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -396,7 +396,7 @@
               "scope": "compile",
               "is_runtime": false,
               "is_optional": true,
-              "is_resolved": null,
+              "is_resolved": false,
               "resolved_package": {},
               "extra_data": {}
             },
@@ -406,7 +406,7 @@
               "scope": "compile",
               "is_runtime": false,
               "is_optional": true,
-              "is_resolved": null,
+              "is_resolved": false,
               "resolved_package": {},
               "extra_data": {}
             },
@@ -416,7 +416,7 @@
               "scope": "compile",
               "is_runtime": false,
               "is_optional": true,
-              "is_resolved": null,
+              "is_resolved": false,
               "resolved_package": {},
               "extra_data": {}
             },
@@ -426,7 +426,7 @@
               "scope": "compile",
               "is_runtime": false,
               "is_optional": true,
-              "is_resolved": null,
+              "is_resolved": false,
               "resolved_package": {},
               "extra_data": {}
             },
@@ -436,7 +436,7 @@
               "scope": "compile",
               "is_runtime": false,
               "is_optional": true,
-              "is_resolved": null,
+              "is_resolved": false,
               "resolved_package": {},
               "extra_data": {}
             },
@@ -446,7 +446,7 @@
               "scope": "test",
               "is_runtime": false,
               "is_optional": true,
-              "is_resolved": null,
+              "is_resolved": false,
               "resolved_package": {},
               "extra_data": {}
             },
@@ -456,7 +456,7 @@
               "scope": "test",
               "is_runtime": false,
               "is_optional": true,
-              "is_resolved": null,
+              "is_resolved": false,
               "resolved_package": {},
               "extra_data": {}
             },
@@ -466,7 +466,7 @@
               "scope": "test",
               "is_runtime": false,
               "is_optional": true,
-              "is_resolved": null,
+              "is_resolved": false,
               "resolved_package": {},
               "extra_data": {}
             },
@@ -476,7 +476,7 @@
               "scope": "test",
               "is_runtime": false,
               "is_optional": true,
-              "is_resolved": null,
+              "is_resolved": false,
               "resolved_package": {},
               "extra_data": {}
             },
@@ -486,7 +486,7 @@
               "scope": "test",
               "is_runtime": false,
               "is_optional": true,
-              "is_resolved": null,
+              "is_resolved": false,
               "resolved_package": {},
               "extra_data": {}
             },
@@ -496,7 +496,7 @@
               "scope": "test",
               "is_runtime": false,
               "is_optional": true,
-              "is_resolved": null,
+              "is_resolved": false,
               "resolved_package": {},
               "extra_data": {}
             }