diff --git a/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties b/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties
index e3646a42..90326243 100644
--- a/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties
+++ b/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java b/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java
index 09ab0b6b..3fab07e6 100644
--- a/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java
+++ b/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java
@@ -305,7 +305,6 @@ protected File getLocalArtifactPath(String groupId, String artifactId, String ve
     }
 
     protected String getJavaVersion() {
-
         String javaVersion = System.getProperty("java.version");
         String realJavaVersion = javaVersion;
 
diff --git a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java
index 75c5279a..1ed824cd 100644
--- a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java
+++ b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerErrorsAsWarningsTest.java
@@ -41,7 +41,7 @@ protected Collection<String> expectedOutputFiles() {
                 || javaVersion.contains("11")
                 || javaVersion.contains("17")
                 || javaVersion.contains("21")
-                || javaVersion.contains("23")) {
+                || javaVersion.contains("24")) {
             return Arrays.asList(
                     "org/codehaus/foo/Deprecation.class",
                     "org/codehaus/foo/ExternalDeps.class",
diff --git a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java
index bf87e8e8..2312f693 100644
--- a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java
+++ b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerFailOnWarningsTest.java
@@ -34,7 +34,7 @@ protected Collection<String> expectedOutputFiles() {
                 || javaVersion.contains("11")
                 || javaVersion.contains("17")
                 || javaVersion.contains("21")
-                || javaVersion.contains("23")) {
+                || javaVersion.contains("24")) {
             return Arrays.asList(
                     "org/codehaus/foo/Deprecation.class",
                     "org/codehaus/foo/ExternalDeps.class",
diff --git a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java
index 042bddb2..1cca0c30 100644
--- a/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java
+++ b/plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java
@@ -68,7 +68,7 @@ protected Collection<String> expectedOutputFiles() {
                 || javaVersion.contains("11")
                 || javaVersion.contains("17")
                 || javaVersion.contains("21")
-                || javaVersion.contains("23")) {
+                || javaVersion.contains("24")) {
             return Arrays.asList(
                     "org/codehaus/foo/Deprecation.class",
                     "org/codehaus/foo/ExternalDeps.class",
diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java b/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java
index c648bc4b..3e0900ee 100644
--- a/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java
+++ b/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java
@@ -22,7 +22,8 @@ protected int expectedWarnings() {
                 || javaVersion.contains("20")
                 || javaVersion.contains("21")
                 || javaVersion.contains("22")
-                || javaVersion.contains("23")) {
+                || javaVersion.contains("23")
+                || javaVersion.contains("24")) {
             return 5;
         }
         return 2;
diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
index 88babc93..895b53e8 100644
--- a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
+++ b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
@@ -59,18 +59,10 @@ protected String getRoleHint() {
     @Override
     protected int expectedErrors() {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("9.0")
-                || javaVersion.contains("11")
-                || javaVersion.contains("14")
-                || javaVersion.contains("15")
-                || javaVersion.contains("16")
+        if (javaVersion.contains("11")
                 || javaVersion.contains("17")
-                || javaVersion.contains("18")
-                || javaVersion.contains("19")
-                || javaVersion.contains("20")
                 || javaVersion.contains("21")
-                || javaVersion.contains("22")
-                || javaVersion.contains("23")) {
+                || javaVersion.contains("24")) {
             return 5;
         }
         // javac output changed for misspelled modifiers starting in 1.6...they now generate 2 errors per occurrence,
@@ -96,7 +88,8 @@ protected int expectedWarnings() {
                 || javaVersion.contains("20")
                 || javaVersion.contains("21")
                 || javaVersion.contains("22")
-                || javaVersion.contains("23")) {
+                || javaVersion.contains("23")
+                || javaVersion.contains("24")) {
             return 1;
         }
         if (javaVersion.contains("1.8")) {
@@ -117,39 +110,30 @@ public String getTargetVersion() {
         String javaVersion = getJavaVersion();
         if (javaVersion.contains("9.0")) {
             return "1.7";
-        }
-        if (javaVersion.contains("11")) {
+        } else if (javaVersion.contains("11")) {
             return "11";
-        }
-        if (javaVersion.contains("14")) {
+        } else if (javaVersion.contains("14")) {
             return "14";
-        }
-        if (javaVersion.contains("15")) {
+        } else if (javaVersion.contains("15")) {
             return "15";
-        }
-        if (javaVersion.contains("16")) {
+        } else if (javaVersion.contains("16")) {
             return "16";
-        }
-        if (javaVersion.contains("17")) {
+        } else if (javaVersion.contains("17")) {
             return "17";
-        }
-        if (javaVersion.contains("18")) {
+        } else if (javaVersion.contains("18")) {
             return "18";
-        }
-        if (javaVersion.contains("19")) {
+        } else if (javaVersion.contains("19")) {
             return "19";
-        }
-        if (javaVersion.contains("20")) {
+        } else if (javaVersion.contains("20")) {
             return "20";
-        }
-        if (javaVersion.contains("21")) {
+        } else if (javaVersion.contains("21")) {
             return "21";
-        }
-        if (javaVersion.contains("22")) {
+        } else if (javaVersion.contains("22")) {
             return "22";
-        }
-        if (javaVersion.contains("23")) {
+        } else if (javaVersion.contains("23")) {
             return "23";
+        } else if (javaVersion.contains("24")) {
+            return "24";
         }
         return super.getTargetVersion();
     }
@@ -159,39 +143,30 @@ public String getSourceVersion() {
         String javaVersion = getJavaVersion();
         if (javaVersion.contains("9.0")) {
             return "1.7";
-        }
-        if (javaVersion.contains("11")) {
+        } else if (javaVersion.contains("11")) {
             return "11";
-        }
-        if (javaVersion.contains("14")) {
+        } else if (javaVersion.contains("14")) {
             return "14";
-        }
-        if (javaVersion.contains("15")) {
+        } else if (javaVersion.contains("15")) {
             return "15";
-        }
-        if (javaVersion.contains("16")) {
+        } else if (javaVersion.contains("16")) {
             return "16";
-        }
-        if (javaVersion.contains("17")) {
+        } else if (javaVersion.contains("17")) {
             return "17";
-        }
-        if (javaVersion.contains("18")) {
+        } else if (javaVersion.contains("18")) {
             return "18";
-        }
-        if (javaVersion.contains("19")) {
+        } else if (javaVersion.contains("19")) {
             return "19";
-        }
-        if (javaVersion.contains("20")) {
+        } else if (javaVersion.contains("20")) {
             return "20";
-        }
-        if (javaVersion.contains("21")) {
+        } else if (javaVersion.contains("21")) {
             return "21";
-        }
-        if (javaVersion.contains("22")) {
+        } else if (javaVersion.contains("22")) {
             return "22";
-        }
-        if (javaVersion.contains("23")) {
+        } else if (javaVersion.contains("23")) {
             return "23";
+        } else if (javaVersion.contains("24")) {
+            return "24";
         }
         return super.getTargetVersion();
     }
@@ -210,7 +185,8 @@ protected Collection<String> expectedOutputFiles() {
                 || javaVersion.contains("20")
                 || javaVersion.contains("21")
                 || javaVersion.contains("22")
-                || javaVersion.contains("23")) {
+                || javaVersion.contains("23")
+                || javaVersion.contains("24")) {
             return Arrays.asList(
                     "org/codehaus/foo/Deprecation.class",
                     "org/codehaus/foo/ExternalDeps.class",
diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java
index d1e89f1b..d0221859 100644
--- a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java
+++ b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java
@@ -27,7 +27,8 @@ public class JavaxToolsCompilerTest extends AbstractJavacCompilerTest {
     @Override
     protected int expectedWarnings() {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("21") || javaVersion.contains("22") || javaVersion.contains("23")) {
+        if (javaVersion.contains("21")
+                || javaVersion.contains("24")) {
             return 1;
         } else {
             return super.expectedWarnings();