Use different TOOLS_JAVA_HOME for proguard and spotbugs

Author: mur47x111

ci/common.jsonnet

@@ -217,15 +217,19 @@ local common_json = import "../common.json";
       }
     },
 
-    local code_tools = {
+    # ProGuard does not yet run on JDK 25
+    proguard: {
       downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
-        TOOLS_JAVA_HOME: jdks_data['oraclejdk21'],
+        TOOLS_JAVA_HOME: jdks_data['oraclejdk24'],
+        IGV_JAVA_HOME: jdks_data['oraclejdk21'],
       } else {},
     },
-    # GR-46676: ProGuard does not yet run on JDK 22
-    proguard: code_tools,
     # GR-49566: SpotBugs does not yet run on JDK 22
-    spotbugs: code_tools,
+    spotbugs: {
+      downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
+        TOOLS_JAVA_HOME: jdks_data['oraclejdk21'],
+      } else {},
+    },
 
     sulong:: self.cmake + {
       packages+: if self.os == "windows" then {