Merge branch 'release/3.3.2' into develop

bsorrentino · Sep 7, 2017 · 8729e11 · 8729e11
2 parents eb20ce6 + 4619f96
commit 8729e11
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -21,11 +21,14 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
 [m2e-annotations](https://github.com/ilx/m2e-annotations) | eclipse plugin
 
 ## Releases ##
-Apr 11,2017 | **Release 3.3.1**. | Available on **[MAVEN CENTRAL REPO](http://search.maven.org/#artifactdetails%7Corg.bsc.maven%7Cmaven-processor-plugin%7C3.3.1%7Cmaven-plugin)** |
+
+Sep 7,2017 | **Release 3.3.2**. | Available on **[MAVEN CENTRAL REPO](http://search.maven.org/#artifactdetails%7Corg.bsc.maven%7Cmaven-processor-plugin%7C3.3.2%7Cmaven-plugin)** |
 ----|----|----
 
-* [Issue 66](https://github.com/bsorrentino/maven-annotation-plugin/issues/66) - source 1.8 ignored
-* [Issue 67](https://github.com/bsorrentino/maven-annotation-plugin/issues/67) - options are not taking in consideration
+* [Issue 69](https://github.com/bsorrentino/maven-annotation-plugin/issues/69) - Java 9 support
+* [Pull request 70](https://github.com/bsorrentino/maven-annotation-plugin/pull/70) - Pass through additional compiler arguments
+
+	> Thanks to [beikov](https://github.com/beikov) for contribution
 
 Apr 10,2017 | **Release 3.3**. | Available on **[MAVEN CENTRAL REPO](http://search.maven.org/#artifactdetails%7Corg.bsc.maven%7Cmaven-processor-plugin%7C3.3%7Cmaven-plugin)** |
 ----|----|----

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>org.bsc.maven</groupId>
   <artifactId>maven-processor-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>3.3.2-SNAPSHOT</version>
+  <version>3.3.2</version>
   <name>MAVEN PROCESSOR PLUGIN - ${project.version}</name>
   <description>A maven plugin to process annotation for jdk6 at compile time
 

diff --git a/src/main/java/org/bsc/maven/plugin/processor/AnnotationProcessorCompiler.java b/src/main/java/org/bsc/maven/plugin/processor/AnnotationProcessorCompiler.java
@@ -280,7 +280,7 @@ private static void printCommand(  final org.codehaus.plexus.compiler.Compiler j
         out.println();
 
     }
-
+    	
 
    private AnnotationProcessorCompiler( Toolchain toolchain, 
                                          CompilerManager plexusCompiler, 
@@ -314,7 +314,7 @@ private void execute(   final Iterable<String> options,
                 javacConf.addClasspathEntry(ii.next());
             }
             else if( "-sourcepath".equals(option) ) {
-                String [] sourceLocations = ii.next().split(":");
+                String [] sourceLocations = ii.next().split(java.util.regex.Pattern.quote(java.io.File.pathSeparator));
                 for( String path : sourceLocations ) {
 
                     final java.io.File dir = new java.io.File( path );
@@ -339,28 +339,27 @@ else if( "-d".equals(option) ) {
             else if( "-s".equals(option) ) {
                 javacConf.setGeneratedSourcesDirectory( new java.io.File(ii.next()));
             }
-            else if( option.startsWith("-A") ) {
+            else /*if( option.startsWith("-A") ) */  { // view pull #70
+                // Just pass through any other arguments
                 javacConf.addCompilerCustomArgument(option, "");   
-
-            }
-            final java.util.Properties props = project.getProperties();
-
-            final String sourceVersion = props.getProperty(PROCESSOR_SOURCE,props.getProperty(COMPILER_SOURCE, DEFAULT_SOURCE_VERSION));
-            final String targetVersion = props.getProperty(PROCESSOR_TARGET,props.getProperty(COMPILER_TARGET, DEFAULT_TARGET_VERSION));
-
-            javacConf.setSourceVersion(sourceVersion );
-            javacConf.setTargetVersion(targetVersion);
-            javacConf.setWorkingDirectory(project.getBasedir());
-
-            final java.util.Set<java.io.File> sourceFiles = 
-                    new java.util.HashSet<java.io.File>();
-            for( JavaFileObject src : compilationUnits ) {
-                sourceFiles.add( new java.io.File( src.toUri() ) );
-
             }
-
-            javacConf.setSourceFiles(sourceFiles);
         }
+        final java.util.Properties props = project.getProperties();
+
+        final String sourceVersion = props.getProperty(PROCESSOR_SOURCE,props.getProperty(COMPILER_SOURCE, DEFAULT_SOURCE_VERSION));
+        final String targetVersion = props.getProperty(PROCESSOR_TARGET,props.getProperty(COMPILER_TARGET, DEFAULT_TARGET_VERSION));
+
+        javacConf.setSourceVersion(sourceVersion );
+        javacConf.setTargetVersion(targetVersion);
+        javacConf.setWorkingDirectory(project.getBasedir());
+
+        final java.util.Set<java.io.File> sourceFiles = 
+                new java.util.HashSet<java.io.File>();
+        for( JavaFileObject src : compilationUnits ) {
+            sourceFiles.add( new java.io.File( src.toUri() ) );
+        }
+
+        javacConf.setSourceFiles(sourceFiles);
         javacConf.setDebug(false);
         javacConf.setFork(true);
         javacConf.setVerbose(false);