Merge pull request #22501 from github/redsun82/robust-java-version-normalisation

Java: make JDK 11 version normalisation in gradle buildless test robust

Author: redsun82

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

@@ -6,7 +6,9 @@
 # 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")]
+    # the JDK build provided by the CI runner image may report any number of version components
+    # (e.g. `11.0.32` or `11.0.32.1`), so keep only the feature version
+    check_diagnostics.replacements = [(r'"11(\.[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")