src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java

*** 42,51 ****
--- 42,52 ----
  import org.graalvm.compiler.debug.DebugDumpHandler;
  import org.graalvm.compiler.debug.DebugHandlersFactory;
  import org.graalvm.compiler.debug.GlobalMetrics;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.serviceprovider.GraalServices;
+ import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
  import org.junit.After;
  import org.junit.Assert;
  import org.junit.AssumptionViolatedException;
  import org.junit.internal.ComparisonCriteria;
  import org.junit.internal.ExactComparisonCriteria;
*** 70,81 ****
          } catch (Exception e) {
              throw new RuntimeException("exception while trying to get Unsafe", e);
          }
      }
  
!     public static final boolean Java8OrEarlier = GraalServices.Java8OrEarlier;
!     public static final boolean Java11OrEarlier = GraalServices.Java11OrEarlier;
  
      protected Method getMethod(String methodName) {
          return getMethod(getClass(), methodName);
      }
  
--- 71,82 ----
          } catch (Exception e) {
              throw new RuntimeException("exception while trying to get Unsafe", e);
          }
      }
  
!     public static final boolean Java8OrEarlier = JavaVersionUtil.Java8OrEarlier;
!     public static final boolean Java11OrEarlier = JavaVersionUtil.Java11OrEarlier;
  
      protected Method getMethod(String methodName) {
          return getMethod(getClass(), methodName);
      }