svn commit: r1400026 - in /maven/plugins/trunk/maven-compiler-plugin: pom.xml src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java

[olamy]

Author: olamy
Date: Fri Oct 19 10:28:29 2012
New Revision: 1400026

URL: http://svn.apache.org/viewvc?rev=1400026&view=rev
Log:
[MCOMPILER-181] Exception on compilation are not properly reported.

Modified:
    maven/plugins/trunk/maven-compiler-plugin/pom.xml
    
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java

Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1400026&r1=1400025&r2=1400026&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Fri Oct 19 10:28:29 2012
@@ -53,8 +53,11 @@ under the License.
 
   <properties>
     <mavenVersion>2.0.9</mavenVersion>
-    <plexusCompilerVersion>1.9.1</plexusCompilerVersion>
+    <plexusCompilerVersion>2.0-SNAPSHOT</plexusCompilerVersion>
     <mavenPluginPluginVersion>3.1</mavenPluginPluginVersion>
+
+    <groovyVersion>1.8.0</groovyVersion>
+    <groovyEclipseCompilerVersion>2.6.0-01</groovyEclipseCompilerVersion>
   </properties>
 
   <dependencies>
@@ -226,10 +229,6 @@ under the License.
   <profiles>
     <profile>
       <id>run-its</id>
-      <properties>
-        <groovyVersion>1.8.0</groovyVersion>
-        <groovyEclipseCompilerVersion>2.6.0-01</groovyEclipseCompilerVersion>
-      </properties>
       <build>
         <pluginManagement>
           <plugins>

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=1400026&r1=1400025&r2=1400026&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
 Fri Oct 19 10:28:29 2012
@@ -318,6 +318,14 @@ public abstract class AbstractCompilerMo
     private boolean skipMultiThreadWarning;
 
     /**
+     * compiler can now use javax.tools if available in your current jdk, you 
can disable this feature
+     * using -Dmaven.compiler.forceJavacCompilerUse=true or in the plugin 
configuration
+     * @since 2.6
+     */
+    @Parameter( defaultValue = "false", property = 
"maven.compiler.forceJavacCompilerUse" )
+    private boolean forceJavacCompilerUse;
+
+    /**
      * @since 2.6 needed for storing the status for the incremental build 
support.
      */
     @Parameter( property = "mojoExecution")
@@ -565,6 +573,8 @@ public abstract class AbstractCompilerMo
 
         getLog().debug( "CompilerReuseStrategy: " + 
compilerConfiguration.getCompilerReuseStrategy().getStrategy() );
 
+        compilerConfiguration.setForceJavacCompilerUse( forceJavacCompilerUse 
);
+
         boolean canUpdateTarget;
 
         IncrementalBuildHelper incrementalBuildHelper = new 
IncrementalBuildHelper( mojoExecution, mavenSession );