Author: niallp
Date: Thu May 22 23:15:10 2008
New Revision: 659442
URL: http://svn.apache.org/viewvc?rev=659442&view=rev
Log:
COMMONSSITE-30 - fix the checkstyle configuration to work for multi-module and
review/update <reporting> plugin version numbers for the poms being changed.
- pom's need to use ${basedir} for configuration files as the multi-module
profile is run from commons-parent, so if not specified it can't find those
files
- the checkstyle configuration file needs to use ${checkstyle.header.file} for
the headerFile property and <headerFile> element added to the plugin config in
the pom.xml
- fix m1 checkstyle config to reflect the above where appropriate (specify
header file property)
Modified:
commons/proper/scxml/branches/J6/pom.xml
commons/proper/scxml/branches/J6/scxml-checks.xml
Modified: commons/proper/scxml/branches/J6/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/pom.xml?rev=659442&r1=659441&r2=659442&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/pom.xml (original)
+++ commons/proper/scxml/branches/J6/pom.xml Thu May 22 23:15:10 2008
@@ -255,8 +255,9 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.1</version>
<configuration>
- <configLocation>scxml-checks.xml</configLocation>
+ <configLocation>${basedir}/scxml-checks.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
+ <headerFile>${basedir}/scxml-asl-header.txt</headerFile>
</configuration>
</plugin>
</plugins>
Modified: commons/proper/scxml/branches/J6/scxml-checks.xml
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/scxml-checks.xml?rev=659442&r1=659441&r2=659442&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/scxml-checks.xml (original)
+++ commons/proper/scxml/branches/J6/scxml-checks.xml Thu May 22 23:15:10 2008
@@ -105,7 +105,7 @@
<!-- <property -->
<!-- name="headerFile" -->
<!-- value="${basedir}/java.header"/> -->
- <property name="headerFile" value="scxml-asl-header.txt"/>
+ <property name="headerFile" value="${checkstyle.header.file}"/>
</module>
<!-- Following interprets the header file as regular expressions. -->
