Merge pull request #45542 from rsvoboda/isJava11OrHigher

Check for Java 17 as a base, remove isJava11OrHigher method
quarkusio · Jan 13, 2025 · 86ff381 · 86ff381
2 parents b870c90 + d59e1ac
commit 86ff381
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java b/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java
@@ -91,8 +91,8 @@ public class QuarkusAugmentor {
     }
 
     public BuildResult run() throws Exception {
-        if (!JavaVersionUtil.isJava11OrHigher()) {
-            throw new IllegalStateException("Quarkus applications require Java 11 or higher to build");
+        if (!JavaVersionUtil.isJava17OrHigher()) {
+            throw new IllegalStateException("Quarkus applications require Java 17 or higher to build");
         }
         long start = System.nanoTime();
         log.debug("Beginning Quarkus augmentation");

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/util/JavaVersionUtil.java b/core/runtime/src/main/java/io/quarkus/runtime/util/JavaVersionUtil.java
@@ -7,7 +7,6 @@ public class JavaVersionUtil {
 
     private static final Pattern PATTERN = Pattern.compile("(?:1\\.)?(\\d+)");
 
-    private static boolean IS_JAVA_11_OR_NEWER;
     private static boolean IS_JAVA_13_OR_NEWER;
     private static boolean IS_GRAALVM_JDK;
     private static boolean IS_JAVA_16_OR_OLDER;
@@ -24,14 +23,12 @@ static void performChecks() {
         Matcher matcher = PATTERN.matcher(System.getProperty("java.specification.version", ""));
         if (matcher.matches()) {
             int first = Integer.parseInt(matcher.group(1));
-            IS_JAVA_11_OR_NEWER = (first >= 11);
             IS_JAVA_13_OR_NEWER = (first >= 13);
             IS_JAVA_16_OR_OLDER = (first <= 16);
             IS_JAVA_17_OR_NEWER = (first >= 17);
             IS_JAVA_19_OR_NEWER = (first >= 19);
             IS_JAVA_21_OR_NEWER = (first >= 21);
         } else {
-            IS_JAVA_11_OR_NEWER = false;
             IS_JAVA_13_OR_NEWER = false;
             IS_JAVA_16_OR_OLDER = false;
             IS_JAVA_17_OR_NEWER = false;
@@ -43,10 +40,6 @@ static void performChecks() {
         IS_GRAALVM_JDK = (vmVendor != null) && vmVendor.startsWith("GraalVM");
     }
 
-    public static boolean isJava11OrHigher() {
-        return IS_JAVA_11_OR_NEWER;
-    }
-
     public static boolean isJava13OrHigher() {
         return IS_JAVA_13_OR_NEWER;
     }

diff --git a/core/runtime/src/test/java/io/quarkus/runtime/util/JavaVersionUtilTest.java b/core/runtime/src/test/java/io/quarkus/runtime/util/JavaVersionUtilTest.java
@@ -12,40 +12,38 @@ class JavaVersionUtilTest {
     @Test
     void testJava8() {
         testWithVersion("1.8", () -> {
-            assertFalse(JavaVersionUtil.isJava11OrHigher());
             assertFalse(JavaVersionUtil.isJava13OrHigher());
         });
     }
 
     @Test
     void testJava11() {
         testWithVersion("11", () -> {
-            assertTrue(JavaVersionUtil.isJava11OrHigher());
             assertFalse(JavaVersionUtil.isJava13OrHigher());
         });
     }
 
     @Test
     void testJava14() {
         testWithVersion("14", () -> {
-            assertTrue(JavaVersionUtil.isJava11OrHigher());
             assertTrue(JavaVersionUtil.isJava13OrHigher());
         });
     }
 
     @Test
     void testJava17() {
         testWithVersion("17", () -> {
-            assertTrue(JavaVersionUtil.isJava11OrHigher());
             assertTrue(JavaVersionUtil.isJava13OrHigher());
+            assertTrue(JavaVersionUtil.isJava17OrHigher());
+            assertFalse(JavaVersionUtil.isJava21OrHigher());
         });
     }
 
     @Test
     void testJava21() {
         testWithVersion("21", () -> {
-            assertTrue(JavaVersionUtil.isJava11OrHigher());
             assertTrue(JavaVersionUtil.isJava13OrHigher());
+            assertTrue(JavaVersionUtil.isJava21OrHigher());
         });
     }