issue #80

add support of javac option --module-path
bsorrentino · Apr 16, 2020 · 8d6d9c3 · 8d6d9c3
1 parent 2e0db25
commit 8d6d9c3
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 12 deletions.
diff --git a/processor/src/main/java/org/bsc/maven/plugin/processor/AbstractAnnotationProcessorMojo.java b/processor/src/main/java/org/bsc/maven/plugin/processor/AbstractAnnotationProcessorMojo.java
@@ -34,6 +34,8 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import javax.tools.JavaCompiler.CompilationTask;
@@ -358,6 +360,8 @@ private String buildProcessor()
         return result.toString();
     }
 
+    protected abstract java.util.Set<String> getResourcesElements( java.util.Set<String> result );
+
     protected abstract java.util.Set<String> getClasspathElements( java.util.Set<String> result );
 
     private String buildCompileSourcepath( Consumer<String> onSuccess) {
@@ -379,7 +383,11 @@ private String buildCompileClasspath()
     {
 
         final java.util.Set<String> pathElements = new java.util.LinkedHashSet<>();
-
+
+        getResourcesElements(pathElements);
+
+        getClasspathElements(pathElements);
+
         if( pluginArtifacts!=null  ) {
 
             for( Artifact a : pluginArtifacts ) {
@@ -389,13 +397,13 @@ private String buildCompileClasspath()
                     java.io.File f = a.getFile();
 
                     if( f!=null ) pathElements.add( a.getFile().getAbsolutePath() );
+
                 }
 
             }
         }
-
-        getClasspathElements(pathElements);
-
+
+
         final StringBuilder result = new StringBuilder();
 
         for( String elem : pathElements ) {
@@ -404,6 +412,13 @@ private String buildCompileClasspath()
         return result.toString();
     }
 
+    private String buildModulePath()
+    {
+
+        return getClasspathElements(new java.util.LinkedHashSet<>())
+                .stream()
+                .collect(Collectors.joining( File.pathSeparator) );
+    }
 
     /**
      * 
@@ -557,7 +572,10 @@ private void executeWithExceptionsHandled() throws Exception
 
         options.add("-cp");
         options.add(compileClassPath);
-
+
+        options.add("--module-path");
+        options.add( buildModulePath() );
+
         buildCompileSourcepath( sourcepath -> {
                 options.add("-sourcepath");
                 options.add(sourcepath);
@@ -586,6 +604,10 @@ private void executeWithExceptionsHandled() throws Exception
             options.add(	releaseVersion );        	
         }
 
+        options.add("-source");
+        options.add("9");
+        options.add("-target");
+        options.add("9");
 
         if( getLog().isDebugEnabled() ) {
             for (String option : options) {

diff --git a/processor/src/main/java/org/bsc/maven/plugin/processor/MainAnnotationProcessorMojo.java b/processor/src/main/java/org/bsc/maven/plugin/processor/MainAnnotationProcessorMojo.java
@@ -20,6 +20,8 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Set;
+
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -94,17 +96,22 @@ public java.util.Set<File> getSourceDirectories( final java.util.Set<File> resul
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    protected java.util.Set<String> getClasspathElements( final java.util.Set<String> result) {
-
-        List<Resource> resources = project.getResources();
+    protected Set<String> getResourcesElements(Set<String> result) {
+        final List<Resource> resources = project.getResources();
 
         if( resources!=null ) {
             for( Resource r : resources ) {
                 result.add(r.getDirectory());
             }
         }
 
+        return result;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    protected java.util.Set<String> getClasspathElements( final java.util.Set<String> result) {
+
         result.addAll( classpathElements );
 
         return result;

diff --git a/processor/src/main/java/org/bsc/maven/plugin/processor/TestAnnotationProcessorMojo.java b/processor/src/main/java/org/bsc/maven/plugin/processor/TestAnnotationProcessorMojo.java
@@ -20,6 +20,8 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Set;
+
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -92,10 +94,8 @@ public java.util.Set<File> getSourceDirectories( final java.util.Set<File> resul
         return result;
     }
 
-
-    @SuppressWarnings("unchecked")
     @Override
-    protected java.util.Set<String> getClasspathElements( final java.util.Set<String> result ) {
+    protected Set<String> getResourcesElements(Set<String> result) {
         final List<Resource> resources = project.getTestResources();
 
         if( resources!=null ) {
@@ -104,6 +104,13 @@ protected java.util.Set<String> getClasspathElements( final java.util.Set<String
             }
         }
 
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected java.util.Set<String> getClasspathElements( final java.util.Set<String> result ) {
+
         result.addAll( classpathElements );
 
         return result;