diff --git a/depaudit/parsers/java.py b/depaudit/parsers/java.py index 9629745..1faf773 100644 --- a/depaudit/parsers/java.py +++ b/depaudit/parsers/java.py @@ -43,7 +43,7 @@ class JavaParser(Parser): version = root.find("version") if group_id is not None and artifact_id is not None: - manifest.project_name = (group_id.text or "") + "/" + (artifact_id.text or "") + manifest.project_name = group_id.text + "/" + artifact_id.text else: manifest.project_name = None manifest.project_version = version.text if version is not None else None @@ -124,7 +124,7 @@ class JavaParser(Parser): if version_match: manifest.project_version = version_match - dep_pattern = r"(?:implementation|api|compileOnly|runtimeOnly|testImplementation|testCompileOnly)\s*[\(\ \"']?\s*([^\s:\'\")]+)\s*:\s*([^\s:\'\")]+)\s*:\s*([^\s:\'\")]+)" + dep_pattern = r"(?:implementation|api|compileOnly|runtimeOnly|testImplementation|testCompileOnly)\s*[\(\"']?\s*([^\s:\'\")]+)\s*:\s*([^\s:\'\")]+)\s*:\s*([^\s:\'\")]+)" for match in re.finditer(dep_pattern, content): group = match.group(1) name = match.group(2) @@ -137,7 +137,7 @@ class JavaParser(Parser): def _extract_gradle_value(self, content: str, key: str) -> str | None: import re patterns = [ - key + r"\s*=\s*[\"\']([^\"\']+)[\"\']", + key + r"\s*=\s*[\"']([^\"']+)[\"']", key + r"\s*=\s*([^\s]+)", ] for pattern in patterns: