From 0ab693fe818ec86abd45c91a54447c64111487f8 Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Thu, 19 Nov 2026 20:54:59 -0500 Subject: [PATCH] fix(maven): match declarations in the project namespace (#12672) --- docs/maven-gradle-metadata.md | 5 +++-- src/java/MavenGradleMetadataParser.test.ts | 10 +++++----- src/java/MavenGradleMetadataParser.ts | 14 ++++++++------ tests/acceptance/mavenGradleMetadataCli.test.ts | 13 +++++++++++-- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/docs/maven-gradle-metadata.md b/docs/maven-gradle-metadata.md index 9639f97395..ae18497e27 100644 --- a/docs/maven-gradle-metadata.md +++ b/docs/maven-gradle-metadata.md @@ -21,8 +21,9 @@ requires an absolute filesystem path and preserves that exact selection: } ``` -REA classifies files by their content. A well-formed Maven `` document -is `maven-pom`. A Gradle metadata object starts with `formatVersion`. +REA classifies files by their content. A Maven `` uses the Maven POM +namespace or legacy unqualified elements. REA reads structural declarations +in the project's namespace. A Gradle metadata object starts with `formatVersion`. Version `1.1` can omit `component` and `variants`. For other revisions, REA also requires a `component` object or `variants` array as format evidence. [Gradle Module Metadata 1.1 specification](https://github.com/gradle/gradle/blob/v9.2.1/platforms/documentation/docs/src/docs/design/gradle-module-metadata-latest-specification.md#contents) diff --git a/src/java/MavenGradleMetadataParser.test.ts b/src/java/MavenGradleMetadataParser.test.ts index 57b49e39e8..4d1e6e8d0a 100644 --- a/src/java/MavenGradleMetadataParser.test.ts +++ b/src/java/MavenGradleMetadataParser.test.ts @@ -623,11 +623,11 @@ it("refuses a document type declaration", () => { ); }); -it("refuses XML that is not a Maven project", () => { - expectFailure( - "demo", - "unsupported", - ); +it.each([ + "demo", + 'demo', +])("refuses XML that is not a Maven project: %s", (source) => { + expectFailure(source, "unsupported"); }); it("refuses a POM with two top-level dependencies blocks", () => { diff --git a/src/java/MavenGradleMetadataParser.ts b/src/java/MavenGradleMetadataParser.ts index d80df4914a..0a275a6558 100644 --- a/src/java/MavenGradleMetadataParser.ts +++ b/src/java/MavenGradleMetadataParser.ts @@ -49,8 +49,13 @@ const childElements = (element: Element): Element[] => { return children; }; -const childrenNamed = (element: Element, local: string): Element[] => - childElements(element).filter((child) => child.localName === local); +const childrenNamed = (element: Element, ...names: string[]): Element[] => + childElements(element).filter( + (child) => + (child.namespaceURI ?? "") === (element.namespaceURI ?? "") && + child.localName !== null && + names.includes(child.localName), + ); const soleNamed = (element: Element, local: string): Element | undefined => { const matches = childrenNamed(element, local); @@ -73,10 +78,7 @@ const isMavenProjectRoot = (root: Node | null): root is Element => { if (root.namespaceURI === MAVEN_POM_NAMESPACE) return true; return ( (root.namespaceURI === null || root.namespaceURI === "") && - childElements(root).some( - (child) => - child.localName === "modelVersion" || child.localName === "artifactId", - ) + childrenNamed(root, "modelVersion", "artifactId").length > 0 ); }; diff --git a/tests/acceptance/mavenGradleMetadataCli.test.ts b/tests/acceptance/mavenGradleMetadataCli.test.ts index 60fdca14c6..0a92117318 100644 --- a/tests/acceptance/mavenGradleMetadataCli.test.ts +++ b/tests/acceptance/mavenGradleMetadataCli.test.ts @@ -25,11 +25,18 @@ const bundleOutputSchema = contractNamed( ).outputSchema; cliTest( - "preserves qualified POM property keys beside their references through CLI, MCP and retained Evidence", + "distinguishes POM declaration namespaces and preserves qualified property keys through CLI and MCP", async ({ cli }) => { const root = await createTestTempDirectory("rea-maven-property-keys-"); const path = join(root, "pom.xml"); - const bytes = Buffer.from(qualifiedMavenPropertiesFixture); + const bytes = Buffer.from( + qualifiedMavenPropertiesFixture + .replace("", "foreign") + .replace( + "", + "foreign", + ), + ); await writeFile(path, bytes); const result = await cli.run({ arguments: ["inspect-maven-gradle-metadata", path, "--json"], @@ -37,6 +44,8 @@ cliTest( expect(result.exitCode, result.stdout + result.stderr).toBe(0); const cliEvidence = outputSchema.parse(result.json); const report = cliEvidence.normalized_result; + expect(report.coordinates.group_id).toBe("example"); + expect(report.dependencies).toHaveLength(1); expect(report.properties).toEqual([ { name: "revision", value: "0", value_credentials_redacted: false }, { name: "a:revision", value: "11", value_credentials_redacted: false },