From 112e144a3f82f27160d0824fc33696586d63686f Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Tue, 19 Aug 2025 09:03:21 +0200 Subject: [PATCH 1/3] svm: move all projects to 24 compliance --- substratevm/mx.substratevm/suite.py | 105 ++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 29 deletions(-) diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py index 2b34b42c5a96..2a265097b27f 100644 --- a/substratevm/mx.substratevm/suite.py +++ b/substratevm/mx.substratevm/suite.py @@ -436,7 +436,9 @@ "jdk.vm.ci.services" ], }, - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "checkstyleVersion" : "10.21.0", "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", @@ -471,7 +473,9 @@ ], }, "checkstyle": "com.oracle.svm.core", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -495,7 +499,9 @@ ], }, "checkstyle": "com.oracle.svm.core", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -518,7 +524,9 @@ ], }, "checkstyle": "com.oracle.svm.core", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -541,7 +549,9 @@ ], }, "checkstyle": "com.oracle.svm.core", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -568,7 +578,9 @@ ], }, "checkstyle": "com.oracle.svm.core", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -598,7 +610,8 @@ ], }, "checkstyle": "com.oracle.svm.core", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -622,7 +635,8 @@ ], }, "checkstyle": "com.oracle.svm.core", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -797,7 +811,9 @@ "jdk.jfr.internal.jfc", ], }, - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "checkstyleVersion": "10.21.0", "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", @@ -840,7 +856,8 @@ "jdk.vm.ci.meta" ], }, - "javaCompliance" : "22+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -884,7 +901,8 @@ "jdk.vm.ci.amd64", ], }, - "javaCompliance" : "22+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -1088,7 +1106,8 @@ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", ], - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) "spotbugs": "false", "jacoco" : "exclude", }, @@ -1126,7 +1145,8 @@ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", ], - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) "spotbugs": "false", "jacoco" : "exclude", }, @@ -1291,7 +1311,9 @@ ], }, "checkstyle": "com.oracle.svm.hosted", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -1322,7 +1344,8 @@ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", ], - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) "spotbugs": "false", "testProject": True, "jacoco" : "exclude", @@ -1380,7 +1403,9 @@ ] }, "checkstyle": "com.oracle.svm.hosted", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -1404,7 +1429,9 @@ "com.oracle.svm.truffle", ], "checkstyle": "com.oracle.svm.hosted", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -1422,7 +1449,9 @@ "com.oracle.svm.core.posix", ], "checkstyle": "com.oracle.svm.hosted", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -1440,7 +1469,9 @@ "com.oracle.svm.core.windows", ], "checkstyle": "com.oracle.svm.hosted", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -1462,7 +1493,8 @@ "com.oracle.svm.graal", ], "checkstyle": "com.oracle.svm.core", - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", @@ -1512,7 +1544,8 @@ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", ], - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) "spotbugs": "false", "jacoco" : "exclude", }, @@ -1539,7 +1572,8 @@ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", ], - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) "spotbugs": "false", "jacoco" : "exclude", }, @@ -1564,7 +1598,8 @@ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", ], - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) "spotbugs": "false", "jacoco" : "exclude", }, @@ -1591,7 +1626,9 @@ "compiler:GRAAL_PROCESSOR", "SVM_PROCESSOR", ], - "javaCompliance" : "21+", + "javaCompliance" : "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "jacoco" : "exclude", "graalCompilerSourceEdition": "ignore", }, @@ -1609,7 +1646,9 @@ ], }, "checkstyle": "com.oracle.svm.hosted", - "javaCompliance": "21+", + "javaCompliance": "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "workingSets": "SVM", "jacoco": "exclude", }, @@ -1635,7 +1674,9 @@ ], }, "checkstyle": "com.oracle.svm.hosted", - "javaCompliance": "21+", + "javaCompliance": "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "substratevm:SVM_PROCESSOR", @@ -1657,7 +1698,9 @@ ], }, "checkstyle": "com.oracle.svm.hosted", - "javaCompliance": "21+", + "javaCompliance": "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "substratevm:SVM_PROCESSOR", @@ -1683,7 +1726,9 @@ ], }, "checkstyle": "com.oracle.svm.hosted", - "javaCompliance": "21+", + "javaCompliance": "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "substratevm:SVM_PROCESSOR", ], @@ -1709,7 +1754,9 @@ ], }, "checkstyle": "com.oracle.svm.hosted", - "javaCompliance": "21+", + "javaCompliance": "24+", + "forceJavac" : "true", # ECJ does not support Java 24 (GR-63814) + "spotbugs": "false", # SpotBugs does not support Java 24 "annotationProcessors": [ "substratevm:SVM_PROCESSOR", ], From 2073f11bc87549a1d522dbc34b3c96acbc500617 Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Tue, 19 Aug 2025 09:59:32 +0200 Subject: [PATCH 2/3] web-image: disable spotbugs --- web-image/mx.web-image/suite.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/web-image/mx.web-image/suite.py b/web-image/mx.web-image/suite.py index 0ea096183807..2149fa439644 100644 --- a/web-image/mx.web-image/suite.py +++ b/web-image/mx.web-image/suite.py @@ -1,5 +1,5 @@ suite = { - "mxversion": "7.55.2", + "mxversion": "7.58.1", "name": "web-image", "versionConflictResolution": "latest", "version": "1.0", @@ -106,7 +106,7 @@ "jdk.internal.vm.ci": ["jdk.vm.ci.code.site", "jdk.vm.ci.code", "jdk.vm.ci.common", "jdk.vm.ci.meta"], }, "javaCompliance": "21+", - "spotbugs": "true", + "spotbugs": "false", # depends on SVM which has compliance level 24 which SpotBugs does not support "workingSets": "web-image", "checkstyleVersion": "10.21.0", "annotationProcessors": [ @@ -125,7 +125,7 @@ "dependencies": [], "requires": ["jdk.httpserver"], "javaCompliance": "21+", - "spotbugs": "true", + "spotbugs": "false", # depends on SVM which has compliance level 24 which SpotBugs does not support "workingSets": "web-image", "annotationProcessors": ["compiler:GRAAL_PROCESSOR"], "checkstyle": "com.oracle.svm.webimage", @@ -138,7 +138,7 @@ "substratevm:SVM_DRIVER", ], "javaCompliance": "21+", - "spotbugs": "true", + "spotbugs": "false", # depends on SVM which has compliance level 24 which SpotBugs does not support "workingSets": "web-image", "annotationProcessors": ["compiler:GRAAL_PROCESSOR"], "checkstyle": "com.oracle.svm.webimage", @@ -162,7 +162,7 @@ ], }, "javaCompliance": "21+", - "spotbugs": "false", + "spotbugs": "false", # depends on SVM which has compliance level 24 which SpotBugs does not support "workingSets": "web-image", "testProject": True, "checkstyle": "com.oracle.svm.webimage", @@ -193,7 +193,7 @@ "jdk.internal.vm.ci": ["jdk.vm.ci.code.site", "jdk.vm.ci.code", "jdk.vm.ci.common", "jdk.vm.ci.meta"], }, "javaCompliance": "21+", - "spotbugs": "true", + "spotbugs": "false", # depends on SVM which has compliance level 24 which SpotBugs does not support "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "substratevm:SVM_PROCESSOR", @@ -213,7 +213,7 @@ "java.logging", ], "javaCompliance": "21+", - "spotbugs": "true", + "spotbugs": "false", # depends on SVM which has compliance level 24 which SpotBugs does not support "annotationProcessors": [ "compiler:GRAAL_PROCESSOR", "substratevm:SVM_PROCESSOR", @@ -256,7 +256,7 @@ }, "javaCompliance": "21+", "workingSets": "web-image", - "spotbugs": "true", + "spotbugs": "false", # depends on SVM which has compliance level 24 which SpotBugs does not support "checkstyle": "com.oracle.svm.hosted", "checkPackagePrefix": False, }, From 093d2ea7f17e568b7295b54869faebde8e2d8e8c Mon Sep 17 00:00:00 2001 From: Josef Eisl Date: Wed, 20 Aug 2025 09:32:59 +0200 Subject: [PATCH 3/3] vm/ci: use the right TOOLS_JAVA_HOME for vm builds --- vm/ci/ci_common/common.jsonnet | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/vm/ci/ci_common/common.jsonnet b/vm/ci/ci_common/common.jsonnet index 72af2b2520ee..eb268dd0ee1e 100644 --- a/vm/ci/ci_common/common.jsonnet +++ b/vm/ci/ci_common/common.jsonnet @@ -161,20 +161,19 @@ local devkits = graal_common.devkits; full_vm_build: graal_common.deps.svm + graal_common.deps.sulong + graal_common.deps.truffleruby + graal_common.deps.graalpy + graal_common.deps.fastr + vm.custom_vm, graalvm_complete_build_deps(edition, os, arch, java_version, espresso_java_version=25, espresso_extra_java_version=[21]): - local java_deps(edition) = { + local java_deps(edition) = + # adds downloads.JAVA_HOME + graal_common.jdks['labsjdk-' + edition + '-' + java_version] + + # add downloads.TOOLS_JAVA_HOME + graal_common.deps.proguard + + { downloads+: { - JAVA_HOME: graal_common.jdks_data['labsjdk-' + edition + '-' + java_version], ESPRESSO_JAVA_HOME: graal_common.jdks_data['labsjdk-ee-' + espresso_java_version], } + ( if (os == 'linux' || os == 'darwin') && (arch == 'amd64') then { ESPRESSO_LLVM_JAVA_HOME: graal_common.jdks_data['labsjdk-ee-' + espresso_java_version + '-llvm'], } else { } - ) + ( - if (java_version == 'latest') then { - TOOLS_JAVA_HOME: graal_common.jdks_data['oraclejdk21'], - } else { - } ) + ( if (std.length(espresso_extra_java_version) > 0) then ({ EXTRA_ESPRESSO_JAVA_HOMES: {pathlist: [graal_common.jdks_data['labsjdk-ee-' + v] for v in espresso_extra_java_version]},