maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1035854 - in /maven/plugins/trunk/maven-checkstyle-plugin: pom.xml src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java
Date Tue, 16 Nov 2010 23:18:02 GMT
Author: olamy
Date: Tue Nov 16 23:18:02 2010
New Revision: 1035854

URL: http://svn.apache.org/viewvc?rev=1035854&view=rev
Log:
[MCHECKSTYLE-132] Upgrade to Checkstyle 5.3

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

Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1035854&r1=1035853&r2=1035854&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Tue Nov 16 23:18:02 2010
@@ -175,9 +175,9 @@ under the License.
 
     <!-- checkstyle -->
     <dependency>
-      <groupId>checkstyle</groupId>
+      <groupId>com.puppycrawl.tools</groupId>
       <artifactId>checkstyle</artifactId>
-      <version>5.0</version>
+      <version>5.3</version>
     </dependency>
 
     <!-- misc -->

Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java?rev=1035854&r1=1035853&r2=1035854&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java
(original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/DefaultCheckstyleExecutor.java
Tue Nov 16 23:18:02 2010
@@ -266,7 +266,11 @@ public class DefaultCheckstyleExecutor
                 {
                     if ( module instanceof DefaultConfiguration )
                     {
-                        ( (DefaultConfiguration) module ).addAttribute( "cacheFile", request.getCacheFile()
);
+                        //MCHECKSTYLE-132 DefaultConfiguration addAttribute has changed in
checkstyle 5.3
+                        if ( ( (DefaultConfiguration) module ).getAttribute( "cacheFile"
) == null )
+                        {
+                            ( (DefaultConfiguration) module ).addAttribute( "cacheFile",
request.getCacheFile() );
+                        }
                     }
                     else
                     {



Mime
View raw message