You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2008/02/03 00:27:31 UTC
svn commit: r617926 -
/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Author: dennisl
Date: Sat Feb 2 15:27:28 2008
New Revision: 617926
URL: http://svn.apache.org/viewvc?rev=617926&view=rev
Log:
[MCHECKSTYLE-48] regression: report generation doesn't work while dealing with the header file
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=617926&r1=617925&r2=617926&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java Sat Feb 2 15:27:28 2008
@@ -990,6 +990,16 @@
p.load( new StringInputStream( propertyExpansion ) );
}
+ // Workaround for MCHECKSTYLE-48
+ // Make sure that "config/maven-header.txt" is the default value
+ // for headerLocation, if configLocation="config/maven_checks.xml"
+ if ( "config/maven_checks.xml".equals( configLocation ) )
+ {
+ if ( "LICENSE.txt".equals( headerLocation ) )
+ {
+ headerLocation = "config/maven-header.txt";
+ }
+ }
if ( StringUtils.isNotEmpty( headerLocation ) )
{
try