Skip to content

[GR-68848] Move most SVM projects to Java 24 compliance #12016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 21, 2025
Merged

[GR-68848] Move most SVM projects to Java 24 compliance #12016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
112e144
svm: move all projects to 24 compliance
zapster Aug 19, 2025
2073f11
web-image: disable spotbugs
zapster Aug 19, 2025
093d2ea
vm/ci: use the right TOOLS_JAVA_HOME for vm builds
zapster Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 76 additions & 29 deletions substratevm/mx.substratevm/suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
},
Expand Down Expand Up @@ -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",
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
},
Expand All @@ -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",
},
Expand All @@ -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",
},
Expand All @@ -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",
},
Expand All @@ -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",
},
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
],
Expand All @@ -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",
],
Expand Down
13 changes: 6 additions & 7 deletions vm/ci/ci_common/common.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]},
Expand Down
Loading