From 004c43e32ac4a6b4a4c8d06f4e033a47e3971499 Mon Sep 17 00:00:00 2001
From: ShuaixinHuang <1836656514@qq.com>
Date: Thu, 19 Nov 2026 03:47:42 +0800
Subject: [PATCH] fix(maven): preserve qualified property keys in metadata
(#11860)
fix(maven): preserve qualified property keys
---
docs/maven-gradle-metadata.md | 5 +-
src/java/MavenGradleMetadata.fixture.ts | 21 +++++
src/java/MavenGradleMetadataParser.ts | 8 +-
.../acceptance/mavenGradleMetadataCli.test.ts | 77 +++++++++++++++++--
4 files changed, 98 insertions(+), 13 deletions(-)
diff --git a/docs/maven-gradle-metadata.md b/docs/maven-gradle-metadata.md
index b8c8ba7ff5..d9d0ad530c 100644
--- a/docs/maven-gradle-metadata.md
+++ b/docs/maven-gradle-metadata.md
@@ -44,7 +44,10 @@ coordinate: [only group/version coordinates may be inherited](https://maven.apac
For a POM, `parent` records the declared parent coordinates and `relative_path`
when present. `relative_path_declared` distinguishes an empty ``,
which disables Maven's local parent lookup, from an omitted tag. `properties`
-lists each child of `` as name and value. URL userinfo
+lists each child of `` as its written qualified name and value.
+Prefixes remain part of the key: `a:revision` and `b:revision` stay distinct
+even when both prefixes bind to the same XML namespace URI, and match the
+spelling kept in `${a:revision}` and `${b:revision}` references. URL userinfo
credentials in a property value are removed and `value_credentials_redacted`
is `true`; when the credential span cannot be located, `value` is `null`.
`dependencies` comes from the project's `` list.
diff --git a/src/java/MavenGradleMetadata.fixture.ts b/src/java/MavenGradleMetadata.fixture.ts
index c337f5062f..62e852b946 100644
--- a/src/java/MavenGradleMetadata.fixture.ts
+++ b/src/java/MavenGradleMetadata.fixture.ts
@@ -54,6 +54,27 @@ export const mavenPomFixture = `
`;
+/** Maven property keys keep their prefixes even when XML namespace URIs agree. */
+export const qualifiedMavenPropertiesFixture = `
+ 4.0.0
+ example
+ qualified-properties
+ \${a:revision}
+
+ 0
+ 11
+ 22
+
+
+
+ example
+ dependency
+ \${b:revision}
+
+
+
+`;
+
/** Tiny Gradle Module Metadata 1.1 document with library and platform variants. */
export const gradleModuleFixture = `{
"formatVersion": "1.1",
diff --git a/src/java/MavenGradleMetadataParser.ts b/src/java/MavenGradleMetadataParser.ts
index 500c1f293e..29702ab2e4 100644
--- a/src/java/MavenGradleMetadataParser.ts
+++ b/src/java/MavenGradleMetadataParser.ts
@@ -325,15 +325,15 @@ const parsePom = (
const properties =
propertiesElement === undefined
? []
- : childElements(propertiesElement).flatMap((property) => {
- const name = nonempty(property.localName);
- if (name === null) return [];
+ : childElements(propertiesElement).map((property) => {
// A property may hold a repository URL; its userinfo never leaves the parser.
const {
url: value,
url_credentials_redacted: value_credentials_redacted,
} = redactRecordedTransportUrl(elementText(property));
- return [{ name, value, value_credentials_redacted }];
+ // 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 };
});
const dependencyManagementElement = soleNamed(root, "dependencyManagement");
const managedContainer = dependencyManagementElement
diff --git a/tests/acceptance/mavenGradleMetadataCli.test.ts b/tests/acceptance/mavenGradleMetadataCli.test.ts
index b393980aa7..60fdca14c6 100644
--- a/tests/acceptance/mavenGradleMetadataCli.test.ts
+++ b/tests/acceptance/mavenGradleMetadataCli.test.ts
@@ -1,15 +1,16 @@
import { createHash } from "node:crypto";
-import { writeFile } from "node:fs/promises";
+import { readFile, writeFile } from "node:fs/promises";
import { join } from "node:path";
import { expect } from "vitest";
import { contractNamed } from "../../src/cli/contractCliDescription.js";
import { MAVEN_GRADLE_METADATA_TOOL_CONTRACTS } from "../../src/contracts/java/mavenGradleMetadataToolContracts.js";
-import { toolContract } from "../../src/contracts/toolContracts.js";
+import { SESSION_TOOL_CONTRACTS } from "../../src/contracts/sessionToolContracts.js";
import { parseEvidenceBundle } from "../../src/domain/evidenceBundle.js";
import { connectLocalToolsMcp } from "../fixtures/localToolsMcp.js";
import {
gradleModuleFixture,
mavenPomFixture,
+ qualifiedMavenPropertiesFixture,
} from "../../src/java/MavenGradleMetadata.fixture.js";
import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js";
import { cliTest } from "../support/cli/cliFixture.js";
@@ -18,6 +19,70 @@ const outputSchema = contractNamed(
MAVEN_GRADLE_METADATA_TOOL_CONTRACTS,
"inspect_maven_gradle_metadata",
).outputSchema;
+const bundleOutputSchema = contractNamed(
+ SESSION_TOOL_CONTRACTS,
+ "get_evidence_bundle",
+).outputSchema;
+
+cliTest(
+ "preserves qualified POM property keys beside their references through CLI, MCP and retained Evidence",
+ async ({ cli }) => {
+ const root = await createTestTempDirectory("rea-maven-property-keys-");
+ const path = join(root, "pom.xml");
+ const bytes = Buffer.from(qualifiedMavenPropertiesFixture);
+ await writeFile(path, bytes);
+ const result = await cli.run({
+ arguments: ["inspect-maven-gradle-metadata", path, "--json"],
+ });
+ expect(result.exitCode, result.stdout + result.stderr).toBe(0);
+ const cliEvidence = outputSchema.parse(result.json);
+ const report = cliEvidence.normalized_result;
+ expect(report.properties).toEqual([
+ { name: "revision", value: "0", value_credentials_redacted: false },
+ { name: "a:revision", value: "11", value_credentials_redacted: false },
+ { name: "b:revision", value: "22", value_credentials_redacted: false },
+ ]);
+ expect(report.coordinates.version).toBe("${a:revision}");
+ expect(report.dependencies[0]?.version).toBe("${b:revision}");
+ expect(report.unresolved).toEqual([
+ {
+ kind: "property",
+ reference: "${a:revision}",
+ field: "version",
+ owner: "project",
+ index: null,
+ },
+ {
+ kind: "property",
+ reference: "${b:revision}",
+ field: "version",
+ owner: "dependency",
+ index: 0,
+ },
+ ]);
+ expect(report.artifact).toEqual({
+ path,
+ bytes: bytes.length,
+ sha256: createHash("sha256").update(bytes).digest("hex"),
+ });
+ const { call } = await connectLocalToolsMcp();
+ const response = await call("inspect_maven_gradle_metadata", { path });
+ expect(response.isError, JSON.stringify(response)).not.toBe(true);
+ const evidence = outputSchema.parse(response.structuredContent);
+ expect(evidence.normalized_result).toEqual(report);
+ const retained = await call("get_evidence_bundle", { detail: "complete" });
+ expect(retained.isError, JSON.stringify(retained)).not.toBe(true);
+ const bundle = parseEvidenceBundle(
+ bundleOutputSchema.parse(retained.structuredContent).result,
+ );
+ expect(
+ bundle.records.find(
+ (record) => record.evidence_id === evidence.evidence_id,
+ ),
+ ).toEqual(evidence);
+ expect((await readFile(path)).equals(bytes)).toBe(true);
+ },
+);
cliTest(
"reports a missing child artifact independently of parent group and version through CLI and MCP",
@@ -65,9 +130,7 @@ cliTest(
const retained = await call("get_evidence_bundle", { detail: "complete" });
expect(retained.isError, JSON.stringify(retained)).not.toBe(true);
const bundle = parseEvidenceBundle(
- toolContract("get_evidence_bundle").outputSchema.parse(
- retained.structuredContent,
- ).result,
+ bundleOutputSchema.parse(retained.structuredContent).result,
);
expect(
bundle.records.find(
@@ -148,9 +211,7 @@ cliTest(
});
expect(retained.isError, JSON.stringify(retained)).not.toBe(true);
const bundle = parseEvidenceBundle(
- toolContract("get_evidence_bundle").outputSchema.parse(
- retained.structuredContent,
- ).result,
+ bundleOutputSchema.parse(retained.structuredContent).result,
);
expect(
bundle.records.find(