Make sure maven.checkstyle.header.file is set to maven.license.licenseFile by default (m1.0 compatibility).

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@379252 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-02-20 22:06:34 +00:00
parent 63492d8427
commit a9ee0f2fbc
2 changed files with 7 additions and 1 deletions

View File

@ -96,6 +96,10 @@
<j:if test="${sourcesPresent == 'true'}"> <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}"/> <util:file var="headerFile" name="${maven.checkstyle.header.file}"/>
<j:if test="${!headerFile.exists()}"> <j:if test="${!headerFile.exists()}">
<ant:echo> <ant:echo>
@ -104,6 +108,7 @@
================================================================= =================================================================
= Your project doesn't contain a header file specified as: = = Your project doesn't contain a header file specified as: =
= ${maven.checkstyle.header.file} = ${maven.checkstyle.header.file}
= (specified by the maven.checkstyle.header.file property) =
= Checkstyle needs it to check the existence of the License in = = Checkstyle needs it to check the existence of the License in =
= your source files. If it can't find this file, it throws an = = your source files. If it can't find this file, it throws an =
= error. = = error. =

View File

@ -26,7 +26,8 @@ maven.checkstyle.excludes =
maven.checkstyle.fail.on.violation = false maven.checkstyle.fail.on.violation = false
maven.checkstyle.cache.file = ${maven.checkstyle.dir}/checkstyle-cachefile maven.checkstyle.cache.file = ${maven.checkstyle.dir}/checkstyle-cachefile
maven.checkstyle.format = sun 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 maven.checkstyle.check.tests=true
# If useFile is false then the checkstyle task will display violations # If useFile is false then the checkstyle task will display violations