From 08bc837b96a531228e0acd8f5ef982aa1581fc1a Mon Sep 17 00:00:00 2001 From: Mads Navntoft Date: Mon, 10 Aug 2026 13:35:46 +0200 Subject: [PATCH 1/2] Java: Redact java_version in gradle-buildless integration test --- .../diagnostics.expected | 2 +- .../gradle-sample-without-wrapper-or-gradle-buildless/test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected index b23aa85f2548..568c2312e97c 100644 --- a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected +++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected @@ -1,7 +1,7 @@ { "attributes": { "java_vendor": "__REDACTED__", - "java_version": "11.0.31" + "java_version": "__REDACTED__" }, "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", "severity": "note", diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py index 92aedd825efa..495d4c40a0a8 100644 --- a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py +++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py @@ -5,7 +5,7 @@ # The version of gradle used doesn't work on java 17 def test(codeql, use_java_11, java, environment, check_diagnostics): - check_diagnostics.redact += ["attributes.java_vendor"] + check_diagnostics.redact += ["attributes.java_vendor", "attributes.java_version"] gradle_override_dir = pathlib.Path(tempfile.mkdtemp()) if runs_on.windows: (gradle_override_dir / "gradle.bat").write_text("@echo off\nexit /b 2\n") From 82dfa2de876e59caf5c64db0c5eb0a63e0494069 Mon Sep 17 00:00:00 2001 From: Mads Navntoft Date: Mon, 10 Aug 2026 16:49:13 +0200 Subject: [PATCH 2/2] Java: Replace instead of redact to preserve major version --- .../diagnostics.expected | 2 +- .../gradle-sample-without-wrapper-or-gradle-buildless/test.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected index 568c2312e97c..f479e56b2e68 100644 --- a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected +++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected @@ -1,7 +1,7 @@ { "attributes": { "java_vendor": "__REDACTED__", - "java_version": "__REDACTED__" + "java_version": "11" }, "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", "severity": "note", diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py index 495d4c40a0a8..3aaee01f4055 100644 --- a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py +++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py @@ -5,7 +5,8 @@ # The version of gradle used doesn't work on java 17 def test(codeql, use_java_11, java, environment, check_diagnostics): - check_diagnostics.redact += ["attributes.java_vendor", "attributes.java_version"] + check_diagnostics.redact += ["attributes.java_vendor"] + check_diagnostics.replacements = [("11\\.[0-9]+\\.[0-9]+", "11")] gradle_override_dir = pathlib.Path(tempfile.mkdtemp()) if runs_on.windows: (gradle_override_dir / "gradle.bat").write_text("@echo off\nexit /b 2\n")