Another attempt

Author: gnodet

plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java

@@ -21,12 +21,12 @@ protected int expectedWarnings()
         String javaVersion = getJavaVersion();
         if (javaVersion.startsWith("1.8")) {
             return 1;
-        } else {
-            if (javaVersion.contains("18") || javaVersion.contains("19") || javaVersion.contains("20")) {
-                return 5;
-            }
-            return 2;
+        } else if (javaVersion.contains("18") || javaVersion.contains("19") || javaVersion.contains("20")) {
+            return 5;
+        } else if (javaVersion.contains("21")) {
+            return 6;
         }
+        return 2;
     }
 
     @Override

plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavacCompilerTest.java

@@ -45,10 +45,13 @@ public void setUp()
         setForceJavacCompilerUse( true );
     }
 
-    protected void configureCompilerConfig( CompilerConfiguration compilerConfig )
-    {
-        if (getJavaVersion().contains("21")) {
-            compilerConfig.setProc("none");
+    @Override
+    protected int expectedWarnings() {
+        String javaVersion = getJavaVersion();
+        if (javaVersion.contains("21")) {
+            return 6;
+        } else {
+            return super.expectedWarnings();
         }
     }
 

plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java

@@ -28,10 +28,13 @@ public class JavaxToolsCompilerTest
 {
     // no op default is to javax.tools if available
 
-    protected void configureCompilerConfig( CompilerConfiguration compilerConfig )
-    {
-        if (getJavaVersion().contains("21")) {
-            compilerConfig.setProc("none");
+    @Override
+    protected int expectedWarnings() {
+        String javaVersion = getJavaVersion();
+        if (javaVersion.contains("21")) {
+            return 6;
+        } else {
+            return super.expectedWarnings();
         }
     }