Issue #147: Support module-path for ECJ

Simply add the path from the CompilerConfiguration to the command-line arguments. Also fix the --processor-module-path argument.
codehaus-plexus · Nov 21, 2021 · 7f7b0f3 · 7f7b0f3
1 parent 9dff918
commit 7f7b0f3
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/...piler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java b/...piler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
@@ -151,7 +151,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
         {
             args.add( "-parameters" );
         }
-        
+
         if(config.isFailOnWarning())
         {
         	args.add("-failOnWarning");
@@ -184,9 +184,9 @@ public CompilerResult performCompile( CompilerConfiguration config )
             String[] annotationProcessors = config.getAnnotationProcessors();
             List<String> processorPathEntries = config.getProcessorPathEntries();
             List<String> processorModulePathEntries = config.getProcessorModulePathEntries();
-            
-            if ( ( annotationProcessors != null && annotationProcessors.length > 0 ) 
-                            || ( processorPathEntries != null && processorPathEntries.size() > 0 ) 
+
+            if ( ( annotationProcessors != null && annotationProcessors.length > 0 )
+                            || ( processorPathEntries != null && processorPathEntries.size() > 0 )
                             || ( processorModulePathEntries != null && processorModulePathEntries.size() > 0 ) )
             {
                 if ( annotationProcessors != null && annotationProcessors.length > 0 )
@@ -209,10 +209,10 @@ public CompilerResult performCompile( CompilerConfiguration config )
                     args.add( "-processorpath" );
                     args.add( getPathString( processorPathEntries ) );
                 }
-                
+
                 if ( processorModulePathEntries != null && processorModulePathEntries.size() > 0 )
                 {
-                    args.add( "-processorpath" );
+                    args.add( "--processor-module-path" );
                     args.add( getPathString( processorModulePathEntries ) );
                 }
 
@@ -229,6 +229,13 @@ public CompilerResult performCompile( CompilerConfiguration config )
         args.add( "-classpath" );
         args.add( getPathString( classpathEntries ) );
 
+        List<String> modulepathEntries = config.getModulepathEntries();
+        if ( modulepathEntries != null && !modulepathEntries.isEmpty() )
+        {
+            args.add( "--module-path" );
+            args.add( getPathString( modulepathEntries ) );
+        }
+
         // Collect sources
         List<String> allSources = new ArrayList<>();
         for ( String source : config.getSourceLocations() )