Provide Gradle toolchain resolver implementation (#5475)

Also offers more information when safety checks fail.
deephaven · May 10, 2024 · d61893f · d61893f
1 parent 59fcced
commit d61893f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
@@ -1 +1,4 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention'
+}
 rootProject.name = 'buildSrc'
diff --git a/server/src/main/java/io/deephaven/server/runner/SafetyChecks.java b/server/src/main/java/io/deephaven/server/runner/SafetyChecks.java
@@ -92,7 +92,9 @@ private static void check() {
             }
             if (isVulnerableVersion() && !hasWorkaround()) {
                 throw exception(JDK_8287432.class, String.format(
-                        "The current JDK is vulnerable to the bug https://bugs.openjdk.org/browse/JDK-8287432. We recommend updating to 11.0.17+, 17.0.5+, or 21+. If that is not possible, you can apply a workaround '%s'.",
+                        "The current JDK %s (located at %s) is vulnerable to the bug https://bugs.openjdk.org/browse/JDK-8287432. We recommend updating to 11.0.17+, 17.0.5+, or 21+. If that is not possible, you can apply a workaround '%s'.",
+                        Runtime.version(),
+                        System.getProperty("java.home"),
                         String.join(" ", workaroundJvmArguments())));
             }
         }

diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.gradle.enterprise' version '3.13.1'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }
 
 gradle.ext.buildStartTime = new Date()