[GR-34184] Remove or replace jdk8 compiler gates.

PullRequest: graal/10199
dedis · Nov 4, 2021 · 91322eb · 91322eb
2 parents 2496739 + 18bb677
commit 91322eb
Show file tree

Hide file tree

Showing 22 changed files with 134 additions and 117 deletions.
diff --git a/ci.hocon b/ci.hocon
@@ -1,5 +1,6 @@
 include "common.hocon"
 labsjdk11: ${labsjdk-ce-11}
+labsjdk17: ${labsjdk-ce-17}
 
 builds = []
 

diff --git a/common.hocon b/common.hocon
@@ -1,9 +1,5 @@
 specVersion = "2"
 
-# oraclejdk* are released OracleJDK binaries
-# oraclejdk* are JDKs based on OracleJDK binaries
-# openjdk8 JDKs on Linux are built by Oracle Labs
-# openjdk8 JDKs on macOS are based on AdoptOpenJDK binaries
 include "common.json"
 include "graal-common.json"
 

diff --git a/compiler/ci_common/gate_tasks.hocon b/compiler/ci_common/gate_tasks.hocon
@@ -2,44 +2,37 @@
 
 builds += [
   # Darwin AMD64
-  ${gateTest}           ${oraclejdk8}      ${gateDarwinAMD64}  {name: "gate-compiler-test-8-darwin-amd64", timelimit: "1:00:00"}
   ${gateTest}           ${labsjdk-ee-11}   ${gateDarwinAMD64}  {name: "weekly-test-compiler-test-labsjdk-ee-11-darwin-amd64"} ${graalWeekly}
-  ${gateTest}           ${labsjdk-ee-17}   ${gateDarwinAMD64}  {name: "weekly-test-compiler-test-17-darwin-amd64", timelimit: "1:00:00"} ${graalWeekly}
-# ${gateTestBenchmark}  ${oraclejdk8}      ${gateDarwinAMD64}  {name: "weekly-test-compiler-benchmarktest-8-darwin-amd64"} ${graalWeekly}
+  ${gateTest}           ${labsjdk-ee-17}   ${gateDarwinAMD64}  {name: "gate-compiler-test-17-darwin-amd64", timelimit: "1:00:00"}
 
   # Windows AMD64
-  ${gateTest}          ${oraclejdk8}       ${gateWindowsAMD64} {name: "gate-compiler-test-8-windows-amd64", timelimit: "55:00"} ${devkits.windows-oraclejdk8}
-# GR-20001
-# ${gateTest}          ${labsjdk-ee-11}    ${gateWindowsAMD64} {name: "gate-compiler-test-labsjdk-ee-11-windows-amd64", timelimit: "50:00"} ${devkits.windows-jdk11}
-  ${gateTest}          ${labsjdk-ee-17}    ${gateWindowsAMD64} {name: "weekly-test-compiler-test-17-windows-amd64", timelimit: "55:00"} ${devkits.windows-jdk17} ${graalWeekly}
+  ${gateTest}          ${labsjdk-ee-11}    ${gateWindowsAMD64} {name: "gate-compiler-test-labsjdk-ee-11-windows-amd64", timelimit: "55:00"} ${devkits.windows-jdk11}
+  ${gateTest}          ${labsjdk-ee-17}    ${gateWindowsAMD64} {name: "gate-compiler-test-labsjdk-ee-17-windows-amd64", timelimit: "55:00"} ${devkits.windows-jdk17}
 
   # Linux AMD64
-  ${gateTest}          ${oraclejdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-test-8-linux-amd64", timelimit: "50:00"}
-  ${gateTest}          ${labsjdk-ee-17}    ${gateLinuxAMD64}   {name: "gate-compiler-test-17-linux-amd64", timelimit: "55:00"}
-  ${gateTest}          ${openjdk8}         ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-openjdk8-linux-amd64"} ${graalWeekly}
-  ${gateTestMaxVS}     ${oraclejdk8}       ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-maxvectorsize"} ${graalWeekly}
-  ${gateTestAVX0}      ${oraclejdk8}       ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-avx0"} ${graalWeekly}
-  ${gateTestAVX1}      ${oraclejdk8}       ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-avx1"} ${graalWeekly}
-  ${gateTest}          ${labsjdk-ee-11}    ${gateLinuxAMD64}   {name: "gate-compiler-test-labsjdk-ee-11-linux-amd64", timelimit: "50:00"}
-  ${gateJavaBaseTest}  ${labsjdk-ee-11}    ${gateLinuxAMD64}   {name: "weekly-test-compiler-javabasetest-labsjdk-ee-11-linux-amd64"} ${graalWeekly}
-  ${gateTestCTW}       ${oraclejdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-ctw-8-linux-amd64"}
-  ${gateTestCTW}       ${labsjdk-ee-17}    ${gateLinuxAMD64}   {name: "gate-compiler-ctw-17-linux-amd64"}
-  ${gateTestCTWWeekly} ${openjdk8}         ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-openjdk8-linux-amd64"} ${graalWeekly} {timelimit: "2:00:00"}
-  ${gateTestCTWWeekly} ${labsjdk-ee-11}    ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-labsjdk-ee-11-linux-amd64"} ${graalWeekly}
-  ${gateTest}          ${oraclejdk8Debug}  ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-fastdebug"} ${graalWeekly} {timelimit: "3:00:00"}
-  ${gateTestBenchmark} ${oraclejdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-8-linux-amd64"}
-  ${gateTestBenchmark} ${labsjdk-ee-11}    ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-11-linux-amd64"}
-  ${gateTestBenchmark} ${labsjdk-ee-17}    ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-17-linux-amd64"}
-  ${gateTestBenchmark} ${oraclejdk8Debug}  ${gateLinuxAMD64}   {name: "weekly-test-compiler-benchmarktest-8-linux-amd64-fastdebug"} ${graalWeekly} {timelimit: "1:00:00"}
-  ${gateStyle}         ${oraclejdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-style-linux-amd64", timelimit: "45:00"}
-  ${gateCoverage}      ${oraclejdk8}       ${gateLinuxAMD64}   {name: "weekly-compiler-coverage-8-linux-amd64"} ${graalWeekly} {timelimit: "1:50:00"}
+  ${gateTest}          ${labsjdk-ee-11}      ${gateLinuxAMD64}   {name: "gate-compiler-test-labsjdk-ee-11-linux-amd64", timelimit: "50:00"}
+  ${gateTest}          ${labsjdk-ee-17}      ${gateLinuxAMD64}   {name: "gate-compiler-test-labsjdk-ee-17-linux-amd64", timelimit: "55:00"}
+  ${gateTestMaxVS}     ${labsjdk-ee-17}      ${gateLinuxAMD64}   {name: "weekly-test-compiler-labsjdk-ee-17-linux-amd64-maxvectorsize"} ${graalWeekly}
+  ${gateTestAVX0}      ${labsjdk-ee-17}      ${gateLinuxAMD64}   {name: "weekly-test-compiler-labsjdk-ee-17-linux-amd64-avx0"} ${graalWeekly}
+  ${gateTestAVX1}      ${labsjdk-ee-17}      ${gateLinuxAMD64}   {name: "weekly-test-compiler-labsjdk-ee-17-linux-amd64-avx1"} ${graalWeekly}
+  ${gateJavaBaseTest}  ${labsjdk-ee-11}      ${gateLinuxAMD64}   {name: "weekly-test-compiler-javabasetest-labsjdk-ee-11-linux-amd64"} ${graalWeekly}
+  ${gateTestCTW}       ${labsjdk-ee-11}      ${gateLinuxAMD64}   {name: "gate-compiler-ctw-labsjdk-ee-11-linux-amd64"}
+  ${gateTestCTW}       ${labsjdk-ee-17}      ${gateLinuxAMD64}   {name: "gate-compiler-ctw-labsjdk-ee-17-linux-amd64"}
+  ${gateTestCTWWeekly} ${labsjdk-ce-11}      ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-labsjdk-ce-11-linux-amd64"} ${graalWeekly} {timelimit: "2:00:00"}
+  ${gateTestCTWWeekly} ${labsjdk-ce-17}      ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-labsjdk-ce-17-linux-amd64"} ${graalWeekly}
+  ${gateTest}          ${labsjdk-ee-17Debug} ${gateLinuxAMD64}   {name: "weekly-test-compiler-labsjdk-ee-17-linux-amd64-fastdebug"} ${graalWeekly} {timelimit: "3:00:00"}
+  ${gateTestBenchmark} ${labsjdk-ee-11}      ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-labsjdk-ee-11-linux-amd64"}
+  ${gateTestBenchmark} ${labsjdk-ee-17}      ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-labsjdk-ee-17-linux-amd64"}
+  ${gateTestBenchmark} ${labsjdk-ee-17Debug} ${gateLinuxAMD64}   {name: "weekly-test-compiler-benchmarktest-labsjdk-ee-17Debug-linux-amd64-fastdebug"} ${graalWeekly} {timelimit: "1:00:00"}
+  ${gateStyle}         ${labsjdk-ee-17}      ${gateLinuxAMD64}   {name: "gate-compiler-style-linux-amd64", timelimit: "45:00"}
+  ${gateCoverage}      ${labsjdk-ee-17Debug} ${gateLinuxAMD64}   {name: "weekly-compiler-coverage-labsjdk-ee-17-linux-amd64"} ${graalWeekly} {timelimit: "1:50:00"}
 
-  ${gateTest}          ${labsjdk-ee-11}    ${gateLinuxAMD64AVX3}   {name: "gate-compiler-test-labsjdk-ee-11-linux-amd64-avx3", targets: [gate], timelimit: "45:00"}
-  ${gateTestCompileImmediately}     ${oraclejdk8}     ${gateLinuxAMD64}   {name: "gate-compiler-test-truffle-compile-immediately-8-linux-amd64", timelimit: "1:00:00"}
+  ${gateTest}          ${labsjdk-ee-11}    ${gateLinuxAMD64AVX3} {name: "gate-compiler-test-labsjdk-ee-11-linux-amd64-avx3", targets: [gate], timelimit: "45:00"}
+  ${gateTestCompileImmediately} ${labsjdk-ee-17} ${gateLinuxAMD64} {name: "gate-compiler-test-truffle-compile-immediately-labsjdk-ee-17-linux-amd64", timelimit: "1:00:00"}
 
   # Linux AArch64
-  ${gateTest}           ${labsjdk-ce-11}      ${gateLinuxAArch64} {name: "gate-compiler-test-labsjdk-ce-11-linux-aarch64",                     timelimit: "1:50:00"}
-  ${gateTestCTW}        ${labsjdk-ce-11}      ${gateLinuxAArch64} {name: "gate-compiler-ctw-labsjdk-ce-11-linux-aarch64",                      timelimit: "1:50:00"}
-  ${gateCoverage}       ${labsjdk-ce-11}      ${gateLinuxAArch64} {name: "weekly-compiler-coverage-11-linux-aarch64"}          ${graalWeekly} {timelimit: "1:50:00"}
+  ${gateTest}           ${labsjdk-ee-11}      ${gateLinuxAArch64} {name: "gate-compiler-test-labsjdk-ee-11-linux-aarch64",                       timelimit: "1:50:00"}
+  ${gateTestCTW}        ${labsjdk-ee-11}      ${gateLinuxAArch64} {name: "gate-compiler-ctw-labsjdk-ee-11-linux-aarch64",                        timelimit: "1:50:00"}
+  ${gateCoverage}       ${labsjdk-ee-11}      ${gateLinuxAArch64} {name: "weekly-compiler-coverage-labsjdk-ee-11-linux-aarch64"} ${graalWeekly} {timelimit: "1:50:00"}
   ${gateTestCTWWeekly}  ${labsjdk-ee-11}      ${gateLinuxAArch64} {name: "weekly-test-compiler-ctw-labsjdk-ee-11-linux-aarch64"} ${graalWeekly}
 ]
diff --git a/compiler/ci_common/gate_tasks_bootstrap.hocon b/compiler/ci_common/gate_tasks_bootstrap.hocon
@@ -1,11 +1,11 @@
 
 builds += [
   # Darwin AMD64
-  ${gateBootstrapLite}       ${oraclejdk8}     ${gateDarwinAMD64Bootstrap}  {name: "gate-compiler-bootstraplite-8-darwin-amd64"}
-  ${gateBootstrapLite}       ${labsjdk-ee-11}  ${gateDarwinAMD64Bootstrap}  {name: "weekly-test-compiler-bootstraplite-labsjdk-ee-11-darwin-amd64"} ${graalWeekly}
+  ${gateBootstrapLite}       ${labsjdk-ee-11}  ${gateDarwinAMD64Bootstrap}  {name: "gate-compiler-bootstraplite-labsjdk-ee-11-darwin-amd64"}
+  ${gateBootstrapLite}       ${labsjdk-ee-17}  ${gateDarwinAMD64Bootstrap}  {name: "gate-compiler-bootstraplite-labsjdk-ee-17-darwin-amd64"}
 
   # Linux AMD64
-  ${gateBootstrap}           ${oraclejdk8}     ${gateLinuxAMD64Bootstrap}   {name: "gate-compiler-bootstrap-8-linux-amd64"}
-  ${gateBootstrapFullVerify} ${oraclejdk8}     ${gateLinuxAMD64Bootstrap}   {name: "gate-compiler-bootstrapfullverify-8-linux-amd64"}
   ${gateBootstrap}           ${labsjdk-ee-11}  ${gateLinuxAMD64Bootstrap}   {name: "gate-compiler-bootstrap-labsjdk-ee-11-linux-amd64"}
+  ${gateBootstrap}           ${labsjdk-ee-17}  ${gateLinuxAMD64Bootstrap}   {name: "gate-compiler-bootstrap-labsjdk-ee-17-linux-amd64"}
+  ${gateBootstrapFullVerify} ${labsjdk-ee-17}  ${gateLinuxAMD64Bootstrap}   {name: "gate-compiler-bootstrapfullverify-labsjdk-ee-17-linux-amd64"}
 ]
diff --git a/compiler/ci_includes/gate.jsonnet b/compiler/ci_includes/gate.jsonnet
@@ -20,6 +20,6 @@
   },
 
   builds: [
-    common.daily + linux_amd64 + common.oraclejdk8 + gate_math_stubs_listener,
+    common.daily + linux_amd64 + common.oraclejdk11 + gate_math_stubs_listener,
   ]
 }
diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
@@ -529,9 +529,12 @@ def compiler_gate_runner(suites, unit_test_runs, bootstrap_tests, tasks, extraVM
         b.run(tasks, extraVMarguments)
 
     with Task('Javadoc', tasks, tags=GraalTags.doc) as t:
-        # metadata package was deprecated, exclude it
-        if t: mx.javadoc(['--exclude-packages', 'com.oracle.truffle.dsl.processor.java,com.oracle.truffle.api.object.dsl'], quietForNoPackages=True)
-
+        if jdk.javaCompliance >= '11':
+            # GR-34816
+            pass
+        else:
+            # metadata package was deprecated, exclude it
+            if t: mx.javadoc(['--exclude-packages', 'com.oracle.truffle.dsl.processor.java,com.oracle.truffle.api.object.dsl'], quietForNoPackages=True)
 
 def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
     # run DaCapo benchmarks #

diff --git a/...graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/SuppressFBWarnings.java b/...graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/SuppressFBWarnings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,21 @@
  */
 package org.graalvm.compiler.core.common;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
- * Used to suppress <a href="http://findbugs.sourceforge.net">FindBugs</a> warnings.
+ * Used to suppress <a href="https://spotbugs.readthedocs.io">SpotBugs</a> warnings.
  */
+@Retention(RetentionPolicy.CLASS)
 public @interface SuppressFBWarnings {
     /**
-     * The set of FindBugs
-     * <a href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
-     * suppressed in annotated element. The value can be a bug category, kind or pattern.
+     * @see "https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html"
      */
     String[] value();
 
     /**
-     * Reason why the warning is suppressed.
+     * Reason why the warning is suppressed. Use a SpotBugs issue id where appropriate.
      */
     String justification();
 }
diff --git a/...src/org.graalvm.compiler.options/src/org/graalvm/compiler/options/SuppressFBWarnings.java b/...src/org.graalvm.compiler.options/src/org/graalvm/compiler/options/SuppressFBWarnings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,22 @@
  */
 package org.graalvm.compiler.options;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
- * Used to suppress <a href="http://findbugs.sourceforge.net">FindBugs</a> warnings.
+ * Used to suppress <a href="https://spotbugs.readthedocs.io">SpotBugs</a> warnings.
  */
-public @interface SuppressFBWarnings {
+@Retention(RetentionPolicy.CLASS)
+@interface SuppressFBWarnings {
     /**
-     * The set of FindBugs
-     * <a href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
-     * suppressed in annotated element. The value can be a bug category, kind or pattern.
+     * @see "https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html"
      */
     String[] value();
 
     /**
-     * Reason why the warning is suppressed.
+     * Reason why the warning is suppressed. Use a SpotBugs issue id where appropriate.
      */
+
     String justification();
 }
diff --git a/.../org.graalvm.compiler.processor/src/org/graalvm/compiler/processor/AbstractProcessor.java b/.../org.graalvm.compiler.processor/src/org/graalvm/compiler/processor/AbstractProcessor.java
@@ -54,7 +54,7 @@
  * {@link javax.annotation.processing.AbstractProcessor} subclass that provides extra functionality.
  */
 @SuppressFBWarnings(value = "NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", //
-                reason = "We want this type to be found when someone is writing a new Graal annotation processor")
+                justification = "We want this type to be found when someone is writing a new Graal annotation processor")
 public abstract class AbstractProcessor extends javax.annotation.processing.AbstractProcessor {
 
     /**

diff --git a/...org.graalvm.compiler.processor/src/org/graalvm/compiler/processor/SuppressFBWarnings.java b/...org.graalvm.compiler.processor/src/org/graalvm/compiler/processor/SuppressFBWarnings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,16 +28,17 @@
 import java.lang.annotation.RetentionPolicy;
 
 /**
- * Used to suppress <a href="http://findbugs.sourceforge.net">FindBugs</a> warnings.
+ * Used to suppress <a href="https://spotbugs.readthedocs.io">SpotBugs</a> warnings.
  */
 @Retention(RetentionPolicy.CLASS)
 @interface SuppressFBWarnings {
     /**
-     * The set of FindBugs
-     * <a href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
-     * suppressed in annotated element. The value can be a bug category, kind or pattern.
+     * @see "https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html"
      */
-    java.lang.String[] value();
+    String[] value();
 
-    String reason();
+    /**
+     * Reason why the warning is suppressed. Use a SpotBugs issue id where appropriate.
+     */
+    String justification();
 }
diff --git a/...mpiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/SuppressFBWarnings.java b/...mpiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/SuppressFBWarnings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,21 @@
  */
 package org.graalvm.compiler.truffle.compiler;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
- * Used to suppress <a href="http://findbugs.sourceforge.net">FindBugs</a> warnings.
+ * Used to suppress <a href="https://spotbugs.readthedocs.io">SpotBugs</a> warnings.
  */
+@Retention(RetentionPolicy.CLASS)
 @interface SuppressFBWarnings {
     /**
-     * The set of FindBugs
-     * <a href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
-     * suppressed in annotated element. The value can be a bug category, kind or pattern.
+     * @see "https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html"
      */
     String[] value();
 
     /**
-     * Reason why the warning is suppressed.
+     * Reason why the warning is suppressed. Use a SpotBugs issue id where appropriate.
      */
     String justification();
 }
diff --git a/...compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/SuppressFBWarnings.java b/...compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/SuppressFBWarnings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,21 @@
  */
 package org.graalvm.compiler.truffle.runtime;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
- * Used to suppress <a href="http://findbugs.sourceforge.net">FindBugs</a> warnings.
+ * Used to suppress <a href="https://spotbugs.readthedocs.io">SpotBugs</a> warnings.
  */
+@Retention(RetentionPolicy.CLASS)
 @interface SuppressFBWarnings {
     /**
-     * The set of FindBugs
-     * <a href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
-     * suppressed in annotated element. The value can be a bug category, kind or pattern.
+     * @see "https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html"
      */
     String[] value();
 
     /**
-     * Reason why the warning is suppressed.
+     * Reason why the warning is suppressed. Use a SpotBugs issue id where appropriate.
      */
     String justification();
 }
diff --git a/espresso/ci_common/common.jsonnet b/espresso/ci_common/common.jsonnet
@@ -11,14 +11,16 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
 {
   local that = self,
 
+  local mx_version = (import "../../graal-common.json").mx_version,
+
   // platform-specific snippets
   common: {
     packages+: {
       '00:pip:logilab-common': '==1.4.4', # forces installation of python2 compliant version of logilab before astroid
       '01:pip:astroid': '==1.1.0',
       'pip:pylint': '==1.1.0',
       'pip:ninja_syntax': '==1.7.2',
-      'mx': 'HEAD',
+      'mx': mx_version,
     },
     environment+: {
       GRAALVM_CHECK_EXPERIMENTAL_OPTIONS: "true",

diff --git a/graal-common.json b/graal-common.json
@@ -1,7 +1,7 @@
 {
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of the graal and graal-enterprise repositories.",
   "ci": {
-    "overlay": "0799e09509ab1a429b63ba5ff0366fe682d04153"
+    "overlay": "031ab3f1c9d415abd5d889227a632d210221b3a5"
   },
   "mx_version" : "HEAD"
 }
diff --git a/sulong/ci.jsonnet b/sulong/ci.jsonnet
@@ -88,7 +88,6 @@ local sc = (import "ci_common/sulong-common.jsonnet");
     sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.darwin_amd64 + sc.llvm4 + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-v40-jdk17-darwin-amd64", timelimit: "0:45:00" },
     sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk17-darwin-amd64", timelimit: "0:45:00" },
 
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk8-linux-amd64" },
     sc.gate + $.sulong + sc.labsjdk_ce_11 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk11-linux-amd64" },
     sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk17-linux-amd64" },
 

diff --git a/sulong/ci_common/sulong-common.jsonnet b/sulong/ci_common/sulong-common.jsonnet
@@ -42,10 +42,6 @@
     assert self.gen_name == self.name : "Name error. expected '%s', actual '%s'" % [self.gen_name, self.name],
   } + if std.objectHasAll(b, "description_text") then { description: "%s with %s on %s/%s" % [b.description_text, self.jdk, self.os, self.arch]} else {},
 
-  jdk8:: common.oraclejdk8 + {
-    jdk:: "jdk8",
-  },
-
   labsjdk_ce_11: common["labsjdk-ce-11"] {
     jdk:: "jdk11",
     downloads+: {