1. Updated the project.xml to depend on checkstyle 2.4
2. Change the invocation of the checkstyle task to use the nested 'property' element to specify the cache file
3. Removed the goal that checks for the LICENSE.txt file. That file was not being used, and checkstyle handles headers in a general way via the 'checkstyle.header.*' properties.
-bk
Index: checkstyle/plugin.jelly
===================================================================
RCS file:
/home/cvspublic/jakarta-turbine-maven/src/plugins-build/checkstyle/plugin.jelly,v
retrieving revision 1.9
diff -r1.9 plugin.jelly
10,11c10,12
< description="Generate code convention conformance reports"
< prereqs="checkstyle:check-license-file"/>
---
> description="Generate code convention conformance reports">
> <attainGoal name="checkstyle:generate-report"/>
> </goal>
52,53c53,54
< failOnViolation="${maven.checkstyle.fail.on.violation}"
< cacheFile="${maven.checkstyle.cache.file}" >
---
> failOnViolation="${maven.checkstyle.fail.on.violation}">
> <property key="checkstyle.cache.file" file="${maven.checkstyle.cache.file}"/>
77,105d77
<
< </goal>
<
< <goal name="checkstyle:check-license-file"
< description="Checks the existence of the LICENSE.txt file">
<
< <available file="${basedir}/LICENSE.txt"
< property="maven.checkstyle.license.exists"/>
< <j:set var="licenseExists" value="${maven.checkstyle.license.exists}X"/>
<
< <j:choose>
< <j:when test="${licenseExists == 'X'}">
< <echo>
< =======================================================================
< = W A R N I N G =
< =======================================================================
< = Your project doesn't contain any LICENSE.txt file. 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. =
< = A temporary solution is to create an empty LICENSE.txt file. =
< = Though, we recommend that you edit this License. =
< =======================================================================
< </echo>
< </j:when>
<
< <j:when test="${maven.checkstyle.license.exists}">
< <attainGoal name="checkstyle:generate-report"/>
< </j:when>
< </j:choose>
Index: checkstyle/project.xml
===================================================================
RCS file:
/home/cvspublic/jakarta-turbine-maven/src/plugins-build/checkstyle/project.xml,v
retrieving revision 1.16
diff -r1.16 project.xml
93c93
< <version>2.3</version>
---
> <version>2.4</version>-- To unsubscribe, e-mail: <mailto:turbine-maven-dev-unsubscribe@;jakarta.apache.org> For additional commands, e-mail: <mailto:turbine-maven-dev-help@;jakarta.apache.org>
