Backport fix from issue #3152

Signed-off-by: Jono Yang <[email protected]>
aboutcode-org · Nov 21, 2022 · 9294e67 · 9294e67
1 parent 8171615
commit 9294e67
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 49 deletions.
diff --git a/src/packagedcode/maven.py b/src/packagedcode/maven.py
@@ -961,7 +961,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/tests/packagedcode/data/maven2/activemq-camel/activemq-camel-pom.xml.package.json b/tests/packagedcode/data/maven2/activemq-camel/activemq-camel-pom.xml.package.json
@@ -36,7 +36,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -46,7 +46,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -56,7 +56,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -66,7 +66,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -76,7 +76,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -86,7 +86,7 @@
       "scope": "test",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -96,7 +96,7 @@
       "scope": "test",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -106,7 +106,7 @@
       "scope": "test",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -116,7 +116,7 @@
       "scope": "test",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -126,7 +126,7 @@
       "scope": "test",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -136,7 +136,7 @@
       "scope": "test",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     }

diff --git a/tests/packagedcode/data/maven2/idega_pom/idega_pom.xml.package.json b/tests/packagedcode/data/maven2/idega_pom/idega_pom.xml.package.json
@@ -65,7 +65,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -75,7 +75,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },

diff --git a/tests/packagedcode/data/maven2/logback-access/logback-access.pom.package.json b/tests/packagedcode/data/maven2/logback-access/logback-access.pom.package.json
@@ -43,7 +43,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -53,7 +53,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -63,7 +63,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -73,7 +73,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -83,7 +83,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     }

diff --git a/.../data/maven2/xml-format-maven-plugin-3.0.6/xml-format-maven-plugin-3.0.6.pom.package.json b/.../data/maven2/xml-format-maven-plugin-3.0.6/xml-format-maven-plugin-3.0.6.pom.package.json
@@ -36,7 +36,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -46,7 +46,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -56,7 +56,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -66,7 +66,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -76,7 +76,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },
@@ -86,7 +86,7 @@
       "scope": "compile",
       "is_runtime": false,
       "is_optional": true,
-      "is_resolved": null,
+      "is_resolved": false,
       "resolved_package": {},
       "extra_data": {}
     },