From b4b174b6465b072cdc264e1d977151f14d0a37b7 Mon Sep 17 00:00:00 2001 From: Nikhil Pareek <8347993+nik13@users.noreply.github.com> Date: Sat, 31 Oct 2026 20:45:56 -0700 Subject: [PATCH] ci(java): keep the Spring AI consumer on the reactor version The consumer from #473 pinned traceai.version 1.0.0 while #481 moved the reactor to 1.0.1, so its CI resolved the published 1.0.0 JAR, which lacks SpringAIObservationFilter, and the Spring AI checks fail on dev. Its release-please extra-file also pointed at java/java/... (paths are relative to the package), which release-please skipped. release_plan --check now reads versions marked x-release-please-version in poms outside the reactor and reports drift from java/pom.xml, as it does for npm VERSION constants and Python __version__. Co-Authored-By: Claude Opus 5.5 --- .github/release/release_plan.py | 22 +++++++++++++++++++--- .github/release/test_release_plan.py | 23 +++++++++++++++++++++++ java/compatibility/spring-ai/pom.xml | 4 ++-- release-please-config.json | 2 +- 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/.github/release/release_plan.py b/.github/release/release_plan.py index 16ec89330..e4c2199cb 100644 --- a/.github/release/release_plan.py +++ b/.github/release/release_plan.py @@ -29,6 +29,8 @@ # INSTRUMENTATION_VERSION constant somewhere under src/ (tests excluded). TS_VERSION_RE = re.compile(r'^\s*(?:export\s+)?const\s+(?:VERSION|INSTRUMENTATION_VERSION)\s*=\s*["\']([^"\']+)["\']', re.M) MAVEN_NS = {"m": "http://maven.apache.org/POM/4.0.0"} +# A version a pom outside the reactor pins with a release-please marker, e.g. the Spring AI consumer. +JAVA_MARKED_RE = re.compile(r">([^<>\s]+)\s*") def pypi_normalize(name: str) -> str: @@ -69,6 +71,17 @@ def declared_ts_versions(pkg_dir: Path) -> dict[str, str]: return out +def declared_java_versions(java: Path) -> dict[str, str]: + out = {} + for f in sorted(java.rglob("pom.xml")): + rel = f.relative_to(java) + if "target" in rel.parts: + continue + if match := JAVA_MARKED_RE.search(f.read_text()): + out[str(rel)] = match.group(1) + return out + + def python_packages(root: Path = REPO_ROOT) -> list[dict]: out = [] for f in sorted((root / "python").rglob("pyproject.toml")): @@ -131,7 +144,8 @@ def other_packages(root: Path = REPO_ROOT) -> list[dict]: artifacts.append(child.findtext("m:artifactId", namespaces=MAVEN_NS)) out.append({"ecosystem": "java", "name": f"{group}:{artifact}", "version": version, "dir": "java", "tag": f"java-v{version}", "core": False, - "group": group, "artifacts": artifacts, "changelog": "java/CHANGELOG.md"}) + "group": group, "artifacts": artifacts, "changelog": "java/CHANGELOG.md", + "declared": declared_java_versions(root / "java")}) manifest_path = root / ".release-please-manifest.json" manifest = json.loads(manifest_path.read_text()) if manifest_path.is_file() else {} for f in sorted((root / "go").glob("*/go.mod")): @@ -164,7 +178,8 @@ def consistency_problems(packages: list[dict]) -> list[str]: seen[key] = p["dir"] for rel, v in p.get("declared", {}).items(): if v != p["version"]: - symbol, manifest = ("VERSION", "package.json") if p["ecosystem"] == "typescript" else ("__version__", "pyproject.toml") + symbol, manifest = {"typescript": ("VERSION", "package.json"), "java": ("the marked traceAI version", "java/pom.xml")}.get( + p["ecosystem"], ("__version__", "pyproject.toml")) problems.append(f"{p['dir']}/{rel}: {symbol} is {v} but {manifest} says {p['version']}") return problems @@ -185,7 +200,8 @@ def coverage_problems(root: Path, packages: list[dict]) -> list[str]: scoped_rel = str(f.relative_to(root / path)) if "x-release-please-version" not in f.read_text(): problems.append(f"{f.relative_to(root)}: missing release-please version marker") - if scoped_rel not in cfg.get(path, {}).get("extra-files", []): + extra_files = {e if isinstance(e, str) else e.get("path") for e in cfg.get(path, {}).get("extra-files", [])} + if scoped_rel not in extra_files: problems.append(f"{p['dir']}/{rel}: missing release-please extra-file") return problems diff --git a/.github/release/test_release_plan.py b/.github/release/test_release_plan.py index f17e61d35..f8ac61dee 100644 --- a/.github/release/test_release_plan.py +++ b/.github/release/test_release_plan.py @@ -84,6 +84,29 @@ def test_npm_version_constants_are_found_in_any_source_file(self): self.assertEqual(by["@traceai/openai"]["declared"], {"src/mcp/patch.ts": "0.1.0", "src/version.ts": "0.1.13"}) self.assertEqual(release_plan.consistency_problems([by["@traceai/openai"]]), ["typescript/packages/traceai_openai/src/mcp/patch.ts: VERSION is 0.1.0 but package.json says 0.1.13"]) + def test_java_consumer_pinned_to_the_reactor_version(self): + # A consumer outside the reactor that pins the SDK resolves the last published JAR if it drifts. + write(self.repo.root / "java/pom.xml", 'com.futureagi' + 'traceai-java-parent1.0.1\n') + consumer = self.repo.root / "java/compatibility/spring-ai/pom.xml" + write(consumer, '1.0.0\n 1.0.0\n\n') + write(self.repo.root / "release-please-config.json", json.dumps({"packages": {"java": {"release-type": "maven", "extra-files": [ + {"type": "generic", "path": "compatibility/spring-ai/pom.xml"}]}}})) + write(self.repo.root / ".release-please-manifest.json", json.dumps({"java": "1.0.1"})) + java = release_plan.other_packages(self.repo.root)[:1] + self.assertEqual(java[0]["declared"], {"compatibility/spring-ai/pom.xml": "1.0.0"}) + self.assertEqual(release_plan.consistency_problems(java), [ + "java/compatibility/spring-ai/pom.xml: the marked traceAI version is 1.0.0 but java/pom.xml says 1.0.1"]) + self.assertEqual(release_plan.coverage_problems(self.repo.root, java), []) + write(consumer, '1.0.1\n 1.0.1\n\n') + java = release_plan.other_packages(self.repo.root)[:1] + self.assertEqual(release_plan.consistency_problems(java), []) + # The extra-file path is relative to the package directory, as release-please resolves it. + write(self.repo.root / "release-please-config.json", json.dumps({"packages": {"java": {"release-type": "maven", "extra-files": [ + {"type": "generic", "path": "java/compatibility/spring-ai/pom.xml"}]}}})) + self.assertEqual(release_plan.coverage_problems(self.repo.root, java), [ + "java/compatibility/spring-ai/pom.xml: missing release-please extra-file"]) + def test_npm_runtime_version_needs_marker_and_extra_file(self): pkg = self.repo.root / "typescript/packages/traceai_openai" write(pkg / "src/version.ts", 'export const VERSION = "0.1.13";\n') diff --git a/java/compatibility/spring-ai/pom.xml b/java/compatibility/spring-ai/pom.xml index 52c36e1f4..9d5404d70 100644 --- a/java/compatibility/spring-ai/pom.xml +++ b/java/compatibility/spring-ai/pom.xml @@ -1,10 +1,10 @@ 4.0.0 - com.futureagi.compatibilityspring-ai-consumer1.0.0 + com.futureagi.compatibilityspring-ai-consumer1.0.1 17UTF-8 - 1.0.0 + 1.0.1 1.1.83.5.15 src/spring1/java diff --git a/release-please-config.json b/release-please-config.json index 391f5d003..95c7346cb 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -953,7 +953,7 @@ "package-name": "com.futureagi:traceai-java-parent", "skip-snapshot": true, "extra-files": [ - {"type": "generic", "path": "java/compatibility/spring-ai/pom.xml"} + {"type": "generic", "path": "compatibility/spring-ai/pom.xml"} ] }, "go/a2a": {