You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/08/12 10:41:22 UTC

svn commit: r1513080 - in /maven/plugins/trunk/maven-compiler-plugin: pom.xml src/it/error-prone-compiler/pom.xml

Author: olamy
Date: Mon Aug 12 08:41:21 2013
New Revision: 1513080

URL: http://svn.apache.org/r1513080
Log:
fix error prone compiler it

Modified:
    maven/plugins/trunk/maven-compiler-plugin/pom.xml
    maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/pom.xml

Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1513080&r1=1513079&r2=1513080&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Mon Aug 12 08:41:21 2013
@@ -250,6 +250,7 @@ under the License.
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-invoker-plugin</artifactId>
+              <version>1.8</version>
               <configuration>
                 <debug>true</debug>
                 <projectsDirectory>src/it</projectsDirectory>

Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/pom.xml?rev=1513080&r1=1513079&r2=1513080&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/pom.xml Mon Aug 12 08:41:21 2013
@@ -46,24 +46,40 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <!--
         <version>3.1</version>
+        -->
+        <version>@project.version@</version>
         <configuration>
-          <useIncrementalCompilation>false</useIncrementalCompilation>
           <compilerId>javac-with-errorprone</compilerId>
+          <forceJavacCompilerUse>true</forceJavacCompilerUse>
         </configuration>
         <dependencies>
           <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-compiler-javac-errorprone</artifactId>
             <version>@plexusCompilerVersion@</version>
+            <exclusions>
+              <exclusion>
+                <groupId>openjdk</groupId>
+                <artifactId>tools</artifactId>
+              </exclusion>
+            </exclusions>
           </dependency>
           <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-javac</artifactId>
+            <version>@plexusCompilerVersion@</version>
+          </dependency>
+
+          <dependency>
             <groupId>openjdk</groupId>
             <artifactId>tools</artifactId>
             <version>1.6</version>
             <scope>system</scope>
             <systemPath>${java.home}/../lib/tools.jar</systemPath>
           </dependency>
+
         </dependencies>
       </plugin>
     </plugins>