Author: ltheussl
Date: Mon Feb 20 14:06:34 2006
New Revision: 379252
URL: http://svn.apache.org/viewcvs?rev=379252&view=rev
Log:
Make sure maven.checkstyle.header.file is set to maven.license.licenseFile by
default (m1.0 compatibility).
Modified:
maven/maven-1/plugins/trunk/checkstyle/plugin.jelly
maven/maven-1/plugins/trunk/checkstyle/plugin.properties
Modified: maven/maven-1/plugins/trunk/checkstyle/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/checkstyle/plugin.jelly?rev=379252&r1=379251&r2=379252&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/checkstyle/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/checkstyle/plugin.jelly Mon Feb 20 14:06:34 2006
@@ -96,6 +96,10 @@
<j:if test="${sourcesPresent == 'true'}">
+ <j:set var="header" value="${maven.checkstyle.header.file}"/>
+ <j:if test="${header == '' or header == null}">
+ <maven:get var="maven.checkstyle.header.file"
plugin="maven-license-plugin" property="maven.license.licenseFile"/>
+ </j:if>
<util:file var="headerFile" name="${maven.checkstyle.header.file}"/>
<j:if test="${!headerFile.exists()}">
<ant:echo>
@@ -104,6 +108,7 @@
=================================================================
= Your project doesn't contain a header file specified as: =
= ${maven.checkstyle.header.file}
+ = (specified by the maven.checkstyle.header.file property) =
= Checkstyle needs it to check the existence of the License in =
= your source files. If it can't find this file, it throws an =
= error. =
Modified: maven/maven-1/plugins/trunk/checkstyle/plugin.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/checkstyle/plugin.properties?rev=379252&r1=379251&r2=379252&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/checkstyle/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/checkstyle/plugin.properties Mon Feb 20
14:06:34 2006
@@ -26,7 +26,8 @@
maven.checkstyle.fail.on.violation = false
maven.checkstyle.cache.file = ${maven.checkstyle.dir}/checkstyle-cachefile
maven.checkstyle.format = sun
-maven.checkstyle.header.file = ${maven.license.licenseFile}
+# this set to ${maven.license.licenseFile} in plugin.jelly:
+# maven.checkstyle.header.file =
maven.checkstyle.check.tests=true
# If useFile is false then the checkstyle task will display violations
