From e1218b0388d963a1a5a4f9aee36846b399186516 Mon Sep 17 00:00:00 2001 From: hhang <17309584214@163.com> Date: Fri, 20 Nov 2026 12:04:11 +0800 Subject: [PATCH] fix(java): preserve Maven POM version spelling (#12714) Co-authored-by: hhang <169027046+xu91102@users.noreply.github.com> --- docs/maven-gradle-metadata.md | 2 ++ src/java/MavenGradleMetadataParser.test.ts | 25 ++++++++++++++++++++++ src/java/MavenGradleMetadataParser.ts | 20 +++++++++++------ 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/docs/maven-gradle-metadata.md b/docs/maven-gradle-metadata.md index 5445fa973b..6a6c534494 100644 --- a/docs/maven-gradle-metadata.md +++ b/docs/maven-gradle-metadata.md @@ -40,6 +40,8 @@ spelled. Missing project coordinates stay `null`. A `${property}` spelling is kept as written and listed in `unresolved`; this reader does not interpolate properties or inherit parent or BOM values. POM text goes through XML end-of-line handling, as Maven's reader applies it: CRLF and lone CR read as LF. +POM coordinates, parent fields, and dependency fields use Maven's trimming +rules, retaining non-ASCII characters at the edges of a declared version. When a parent is declared, omitted project group/version fields point to the parent as possible sources. An omitted project `artifactId` is a missing child coordinate: [only group/version coordinates may be inherited](https://maven.apache.org/pom.html#Maven_Coordinates). diff --git a/src/java/MavenGradleMetadataParser.test.ts b/src/java/MavenGradleMetadataParser.test.ts index 4d1e6e8d0a..a2bc64448b 100644 --- a/src/java/MavenGradleMetadataParser.test.ts +++ b/src/java/MavenGradleMetadataParser.test.ts @@ -449,6 +449,31 @@ it("applies XML end-of-line handling to POM text", () => { ]); }); +it.each([ + [" ", "\u00a0"], + ["", "\ufeff"], + [" ", ""], +])( + "preserves declared POM version characters at a %s boundary", + (reference, retained) => { + const report = parse(` + 4.0.0 + example + demo + ${reference}1.0${reference} + + + example + library + ${reference}2.0${reference} + + + `); + expect(report.coordinates.version).toBe(`${retained}1.0${retained}`); + expect(report.dependencies[0]?.version).toBe(`${retained}2.0${retained}`); + }, +); + it("lists properties in packaging, scope, type and classifier", () => { const report = parse(` com.example diff --git a/src/java/MavenGradleMetadataParser.ts b/src/java/MavenGradleMetadataParser.ts index 7924e7a582..eac7fc9b0c 100644 --- a/src/java/MavenGradleMetadataParser.ts +++ b/src/java/MavenGradleMetadataParser.ts @@ -97,8 +97,7 @@ const nonempty = (value: string | null | undefined): string | null => { return trimmed === "" ? null : trimmed; }; -const elementText = (element: Element | undefined): string | null => { - if (element === undefined) return null; +const elementText = (element: Element): string => { const parts: string[] = []; for ( let child = element.firstChild; @@ -108,11 +107,20 @@ const elementText = (element: Element | undefined): string | null => { // Text (3) and CDATA section (4) nodes both carry character data. if (child.nodeType === 3 || child.nodeType === 4) parts.push(child.nodeValue ?? ""); - return nonempty(parts.join("")); + return parts.join(""); }; -const childText = (element: Element, local: string): string | null => - elementText(soleNamed(element, local)); +const childText = (element: Element, local: string): string | null => { + const child = soleNamed(element, local); + if (child === undefined) return null; + const text = elementText(child); + // Maven's model reader applies Java String.trim() to these fields. + let start = 0; + let end = text.length; + while (start < end && text.charCodeAt(start) <= 0x20) start += 1; + while (end > start && text.charCodeAt(end - 1) <= 0x20) end -= 1; + return start === end ? null : text.slice(start, end); +}; const textOf = (value: unknown): string | null => typeof value === "string" ? nonempty(value) : null; @@ -346,7 +354,7 @@ const parsePom = ( const { url: value, url_credentials_redacted: value_credentials_redacted, - } = redactRecordedTransportUrl(elementText(property)); + } = redactRecordedTransportUrl(nonempty(elementText(property))); // Maven property keys are the written qualified names, not XML // expanded names: different prefixes remain different keys. return { name: property.tagName, value, value_credentials_redacted };