Merge pull request #22308 from github/navntoft/fix-gradle-buildless-test

Java: Normalize java_version in integration test

Author: navntoft

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": "11"
   },
   "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
   "severity": "note",

java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py

@@ -6,6 +6,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.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")