fix jdk14 build, upgrade eclipse compiler version

Signed-off-by: olivier lamy <[email protected]>

Author: olamy

.github/workflows/maven.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest,windows-latest, macOS-latest]
-        java: [8, 11]
+        java: [8, 11, 14]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}

plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java

@@ -135,7 +135,7 @@ public void testCompilingSources()
             }
 
             assertEquals( "Wrong number of compilation errors (" + numCompilerErrors + "/" + expectedErrors //
-                              + ") : " + errors, expectedErrors, numCompilerErrors );
+                              + ") : " + displayLines( errors ), expectedErrors, numCompilerErrors );
         }
 
         int expectedWarnings = expectedWarnings();
@@ -157,13 +157,25 @@ public void testCompilingSources()
                 warnings.add( error.getMessage() );
             }
 
-            assertEquals( "Wrong number (" + numCompilerWarnings + "/" + expectedWarnings + ") of compilation warnings: " + warnings, //
-                          expectedWarnings, numCompilerWarnings );
+            assertEquals( "Wrong number (" + numCompilerWarnings + "/"
+                              + expectedWarnings + ") of compilation warnings: " + displayLines( warnings ), //
+                          expectedWarnings, numCompilerWarnings);
         }
 
         assertEquals( new TreeSet<>( normalizePaths( expectedOutputFiles() ) ), files );
     }
 
+    protected String displayLines( List<String> warnings)
+    {
+        // with java8 could be as simple as String.join(System.lineSeparator(), warnings)
+        StringBuilder sb = new StringBuilder( System.lineSeparator() );
+        for ( String warning : warnings )
+        {
+            sb.append( '-' ).append( warning ).append( System.lineSeparator() );
+        }
+        return sb.toString();
+    }
+
     private List<CompilerConfiguration> getCompilerConfigurations()
         throws Exception
     {

plexus-compilers/plexus-compiler-eclipse/pom.xml

@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>ecj</artifactId>
-      <version>3.15.1</version>
+      <version>3.22.0</version>
     </dependency>
   </dependencies>
 

plexus-compilers/plexus-compiler-j2objc/src/main/java/org/codehaus/plexus/compiler/j2objc/J2ObjCCompiler.java

@@ -293,11 +293,7 @@ private List<CompilerMessage> compileOutOfProcess( File workingDirectory, File t
 
             messages = parseCompilerOutput( new BufferedReader( new StringReader( stringWriter.toString() ) ) );
         }
-        catch ( CommandLineException e )
-        {
-            throw new CompilerException( "Error while executing the external compiler.", e );
-        }
-        catch ( IOException e )
+        catch ( CommandLineException | IOException e )
         {
             throw new CompilerException( "Error while executing the external compiler.", e );
         }

plexus-compilers/plexus-compiler-j2objc/src/test/java/org/codehaus/plexus/compiler/j2objc/J2ObjCCompilerTest.java

@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import junit.framework.TestCase;
 import org.codehaus.plexus.compiler.CompilerConfiguration;
 import org.codehaus.plexus.compiler.CompilerException;
@@ -47,7 +47,7 @@ public void testJ2ObjCCompiler()
         throws IOException
     {
         J2ObjCCompiler comp = new J2ObjCCompiler();
-        Map<String, String> customCompilerArguments = new HashMap<String, String>();
+        Map<String, String> customCompilerArguments = new HashMap<>();
         customCompilerArguments.put( "-use-arc", null );
         customCompilerArguments.put( "-sourcepath", "src/test/resources" );
         CompilerConfiguration cc = new CompilerConfiguration();

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

@@ -61,7 +61,7 @@ protected String getRoleHint()
     protected int expectedErrors()
     {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("9.0")||javaVersion.contains("11")){
+        if (Arrays.asList("9.0","11", "14").contains( javaVersion )){
             // lots of new warnings about obsoletions for future releases
             return 5;
         }
@@ -80,7 +80,7 @@ protected int expectedErrors()
     protected int expectedWarnings()
     {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("11")){
+        if (Arrays.asList("11", "14").contains( javaVersion )){
             return 1;
         }
         if (javaVersion.contains("9.0")){
@@ -122,13 +122,16 @@ public String getTargetVersion()
     public String getSourceVersion()
     {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("9.0")){
+        if (javaVersion.contains("9.0"))
+        {
             return "1.7";
         }
-        if (javaVersion.contains("11")){
+        if (javaVersion.contains("11"))
+        {
             return "11";
         }
-        if (javaVersion.contains("14")){
+        if (javaVersion.contains("14"))
+        {
             return "14";
         }
         return super.getTargetVersion();
@@ -137,7 +140,8 @@ public String getSourceVersion()
     protected Collection<String> expectedOutputFiles()
     {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("9.0")||javaVersion.contains("11")){
+        if (Arrays.asList( "9.0", "11", "14").contains( javaVersion ))
+        {
             return Arrays.asList( new String[]{ "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class",
                 "org/codehaus/foo/Person.class"} );
         }

pom.xml

@@ -86,7 +86,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.1</version>
+          <version>3.0.0-M5</version>
           <configuration>
             <redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
           </configuration>
@@ -160,7 +160,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M2</version>
+        <version>3.0.0-M3</version>
         <executions>
           <execution>
             <id>enforce-java</id>