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

[khmarbaise]

Author: khmarbaise
Date: Sun Nov 16 22:56:12 2014
New Revision: 1640047

URL: http://svn.apache.org/r1640047
Log:
[MCOMPILER-238] Upgrade to maven-plugins parent version 27

Modified:
    maven/plugins/trunk/maven-compiler-plugin/pom.xml
    
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/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=1640047&r1=1640046&r2=1640047&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Sun Nov 16 22:56:12 2014
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>25</version>
+    <version>27</version>
     <relativePath>../maven-plugins/pom.xml</relativePath>
   </parent>
 
@@ -219,7 +219,7 @@ under the License.
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
-            <excludes>
+            <excludes combine.children="append">
               
<exclude>src/it/jdk16-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor</exclude>
             </excludes>
           </configuration>

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java?rev=1640047&r1=1640046&r2=1640047&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
 Sun Nov 16 22:56:12 2014
@@ -682,10 +682,12 @@ public abstract class AbstractCompilerMo
 
                 incrementalBuildHelperRequest = new 
IncrementalBuildHelperRequest().inputFiles( sources );
 
+                // CHECKSTYLE_OFF: LineLength
                 if ( ( compiler.getCompilerOutputStyle().equals( 
CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES ) && !canUpdateTarget )
                     || isDependencyChanged()
                     || isSourceChanged( compilerConfiguration, compiler )
                     || incrementalBuildHelper.inputFileTreeChanged( 
incrementalBuildHelperRequest ) )
+                    // CHECKSTYLE_ON: LineLength
                 {
                     getLog().info( "Changes detected - recompiling the 
module!" );