add workaround to jdk bug https://bugs.openjdk.java.net/browse/JDK-8210649 found via https://issues.apache.org/jira/browse/MCOMPILER-346 add IT test from https://github.com/basil/MCOMPILER-346-mre (#196)

olamy · web-flow · commit ea3680f097a5 · 2022-03-06T14:32:07.000+10:00
* add workaround to jdk bug https://bugs.openjdk.java.net/browse/JDK-8210649 found via https://issues.apache.org/jira/browse/MCOMPILER-346 add IT test from https://github.com/basil/MCOMPILER-346-mre * bump version as an interface changed a bit but not really someone use it as it was not extensible here... :) Signed-off-by: Olivier Lamy <olamy@apache.org>
diff --git a/plexus-compiler-api/pom.xml b/plexus-compiler-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compiler</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>plexus-compiler-api</artifactId>
diff --git a/plexus-compiler-its/pom.xml b/plexus-compiler-its/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compiler</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>plexus-compiler-its</artifactId>
diff --git a/plexus-compiler-its/src/main/it/MCOMPILER-346-mre b/plexus-compiler-its/src/main/it/MCOMPILER-346-mre
@@ -0,0 +1 @@
+Subproject commit 33fdb68fb6ce2042db7945b873c7b57ee3f65157
diff --git a/plexus-compiler-its/src/main/it/simple-eclipse-compiler/pom.xml b/plexus-compiler-its/src/main/it/simple-eclipse-compiler/pom.xml
@@ -55,7 +55,7 @@
           <compilerId>eclipse</compilerId>
         </configuration>
         <dependencies>
-            <dependency>
+          <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-compiler-api</artifactId>
             <version>@pom.version@</version>
diff --git a/plexus-compiler-manager/pom.xml b/plexus-compiler-manager/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compiler</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>plexus-compiler-manager</artifactId>
diff --git a/plexus-compiler-test/pom.xml b/plexus-compiler-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compiler</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>plexus-compiler-test</artifactId>
diff --git a/plexus-compilers/plexus-compiler-aspectj/pom.xml b/plexus-compilers/plexus-compiler-aspectj/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compilers</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>plexus-compiler-aspectj</artifactId>
diff --git a/plexus-compilers/plexus-compiler-csharp/pom.xml b/plexus-compilers/plexus-compiler-csharp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compilers</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>plexus-compiler-csharp</artifactId>
diff --git a/plexus-compilers/plexus-compiler-eclipse/pom.xml b/plexus-compilers/plexus-compiler-eclipse/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compilers</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>plexus-compiler-eclipse</artifactId>
diff --git a/plexus-compilers/plexus-compiler-j2objc/pom.xml b/plexus-compilers/plexus-compiler-j2objc/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compilers</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>plexus-compiler-j2objc</artifactId>
diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compilers</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>plexus-compiler-javac-errorprone</artifactId>
diff --git a/plexus-compilers/plexus-compiler-javac/pom.xml b/plexus-compilers/plexus-compiler-javac/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compilers</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>plexus-compiler-javac</artifactId>
diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/InProcessCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/InProcessCompiler.java
@@ -3,8 +3,9 @@
 import org.codehaus.plexus.compiler.CompilerConfiguration;
 import org.codehaus.plexus.compiler.CompilerException;
 import org.codehaus.plexus.compiler.CompilerResult;
+import org.codehaus.plexus.logging.LogEnabled;
 
-public interface InProcessCompiler {
+public interface InProcessCompiler extends LogEnabled {
 
 	CompilerResult compileInProcess(String[] args, final CompilerConfiguration config, String[] sourceFiles)
 			throws CompilerException;
diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
@@ -70,6 +70,7 @@
 import org.codehaus.plexus.compiler.CompilerOutputStyle;
 import org.codehaus.plexus.compiler.CompilerResult;
 import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.Os;
 import org.codehaus.plexus.util.StringUtils;
@@ -106,6 +107,9 @@ public class JavacCompiler
 
     private List<Class<?>> javaccClasses = new CopyOnWriteArrayList<>();
 
+    @Requirement
+    private InProcessCompiler inProcessCompiler;
+
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
@@ -186,10 +190,10 @@ public CompilerResult performCompile( CompilerConfiguration config )
         return result;
     }
 
-	protected InProcessCompiler inProcessCompiler()
-	{
-		return new org.codehaus.plexus.compiler.javac.JavaxToolsCompiler();
-	}
+    protected InProcessCompiler inProcessCompiler()
+    {
+        return inProcessCompiler;
+    }
 
     protected static boolean isJava16()
     {
diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompiler.java
@@ -18,12 +18,12 @@
  * under the License.
  */
 
-import org.codehaus.plexus.compiler.Compiler;
 import org.codehaus.plexus.compiler.CompilerConfiguration;
 import org.codehaus.plexus.compiler.CompilerMessage;
 import org.codehaus.plexus.compiler.CompilerException;
 import org.codehaus.plexus.compiler.CompilerResult;
 import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
@@ -36,15 +36,16 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * @author Olivier Lamy
  * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
  * @since 2.0
  */
-@Component( role = Compiler.class )
-public class JavaxToolsCompiler implements InProcessCompiler
+@Component( role = InProcessCompiler.class )
+public class JavaxToolsCompiler extends AbstractLogEnabled implements InProcessCompiler
 {
     /**
      * is that thread safe ???
@@ -57,7 +58,7 @@ protected JavaCompiler newJavaCompiler()
 		return ToolProvider.getSystemJavaCompiler();
 	}
 
-    private List<JavaCompiler> JAVA_COMPILERS = new CopyOnWriteArrayList<>();
+    private final List<JavaCompiler> JAVA_COMPILERS = new CopyOnWriteArrayList<>();
 
     private JavaCompiler getJavaCompiler( CompilerConfiguration compilerConfiguration )
     {
@@ -111,14 +112,14 @@ public CompilerResult compileInProcess( String[] args, final CompilerConfigurati
                                                                CompilerMessage.Kind.ERROR );
                 return new CompilerResult( false, Collections.singletonList( message ) );
             }
-            final String sourceEncoding = config.getSourceEncoding();
-            final Charset sourceCharset = sourceEncoding == null ? null : Charset.forName( sourceEncoding );
-            final DiagnosticCollector<JavaFileObject> collector = new DiagnosticCollector<>();
-            try ( final StandardJavaFileManager standardFileManager =
+            String sourceEncoding = config.getSourceEncoding();
+            Charset sourceCharset = sourceEncoding == null ? null : Charset.forName( sourceEncoding );
+            DiagnosticCollector<JavaFileObject> collector = new DiagnosticCollector<>();
+            try ( StandardJavaFileManager standardFileManager =
                 compiler.getStandardFileManager( collector, null, sourceCharset ) )
             {
 
-                final Iterable<? extends JavaFileObject> fileObjects =
+                Iterable<? extends JavaFileObject> fileObjects =
                     standardFileManager.getJavaFileObjectsFromStrings( Arrays.asList( sourceFiles ) );
 
                  /*(Writer out,
@@ -130,14 +131,27 @@ public CompilerResult compileInProcess( String[] args, final CompilerConfigurati
 
                 List<String> arguments = Arrays.asList( args );
 
-                final JavaCompiler.CompilationTask task =
+                JavaCompiler.CompilationTask task =
                     compiler.getTask( null, standardFileManager, collector, arguments, null, fileObjects );
-                final Boolean result = task.call();
-                final ArrayList<CompilerMessage> compilerMsgs = new ArrayList<>();
+                Boolean result = task.call();
+                List<CompilerMessage> compilerMsgs = new ArrayList<>();
+
                 for ( Diagnostic<? extends JavaFileObject> diagnostic : collector.getDiagnostics() )
                 {
-                    CompilerMessage.Kind kind = convertKind(diagnostic);
-                    String baseMessage = diagnostic.getMessage( null );
+                    CompilerMessage.Kind kind = convertKind( diagnostic );
+
+                    String baseMessage;
+                    try
+                    {
+                        baseMessage = diagnostic.getMessage( Locale.getDefault() );
+                    }
+                    catch ( AssertionError e )
+                    {
+                        // workaround for https://bugs.openjdk.java.net/browse/JDK-8210649
+                        getLogger().debug( "Ignore Issue get JavaCompiler Diagnostic message (see https://bugs.openjdk.java.net/browse/JDK-8210649):" + e.getMessage(), e );
+                        // in this case we try to replace the baseMessage with toString (hoping this does not throw a new exception..
+                        baseMessage = diagnostic.toString();
+                    }
                     if ( baseMessage == null )
                     {
                         continue;
@@ -185,7 +199,6 @@ public CompilerResult compileInProcess( String[] args, final CompilerConfigurati
         finally
         {
             releaseJavaCompiler( compiler, config );
-
         }
     }
 
diff --git a/plexus-compilers/pom.xml b/plexus-compilers/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus-compiler</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>plexus-compilers</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>plexus-compiler</artifactId>
-  <version>2.10.1-SNAPSHOT</version>
+  <version>2.11.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Plexus Compiler</name>
@@ -45,7 +45,7 @@
     <scm.url>scm:git:git@github.com:codehaus-plexus/plexus-compiler.git</scm.url>
     <javaVersion>11</javaVersion>
     <redirectTestOutputToFile>true</redirectTestOutputToFile>
-    <project.build.outputTimestamp>2022-02-08T11:49:09Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2022-03-06T00:54:21Z</project.build.outputTimestamp>
     <jupiter.version>5.8.2</jupiter.version>
     <aspectj.version>1.9.7.M3</aspectj.version>
     <errorprone.version>2.11.0</errorprone.version>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 33fdb68fb6ce2042db7945b873c7b57ee3f65157`