Author: niallp
Date: Thu May 22 23:14:37 2008
New Revision: 659441
URL: http://svn.apache.org/viewvc?rev=659441&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/math/branches/MATH_2_0/checkstyle.xml
commons/proper/math/branches/MATH_2_0/pom.xml
commons/proper/math/branches/MATH_2_0/project.properties
Modified: commons/proper/math/branches/MATH_2_0/checkstyle.xml
URL:
http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/checkstyle.xml?rev=659441&r1=659440&r2=659441&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/checkstyle.xml (original)
+++ commons/proper/math/branches/MATH_2_0/checkstyle.xml Thu May 22 23:14:37
2008
@@ -27,8 +27,7 @@
<!-- Verify that EVERY source file has the appropriate license -->
<module name="Header">
- <property name="headerFile" value="license-header.txt"/>
- <property name="ignoreLines" value="2"/>
+ <property name="headerFile" value="${checkstyle.header.file}"/>
</module>
<!-- Operator must be at end of wrapped line -->
Modified: commons/proper/math/branches/MATH_2_0/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/pom.xml?rev=659441&r1=659440&r2=659441&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/pom.xml (original)
+++ commons/proper/math/branches/MATH_2_0/pom.xml Thu May 22 23:14:37 2008
@@ -253,7 +253,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.0-beta-2</version>
+ <version>2.0</version>
<configuration>
<xmlPath>${basedir}/src/site/xdoc/changes.xml</xmlPath>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
@@ -271,8 +271,9 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.1</version>
<configuration>
- <configLocation>checkstyle.xml</configLocation>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
+ <headerFile>${basedir}/license-header.txt</headerFile>
</configuration>
</plugin>
<plugin>
@@ -290,7 +291,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.2</version>
<configuration>
<minSeverity>info</minSeverity>
</configuration>
Modified: commons/proper/math/branches/MATH_2_0/project.properties
URL:
http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/project.properties?rev=659441&r1=659440&r2=659441&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/project.properties (original)
+++ commons/proper/math/branches/MATH_2_0/project.properties Thu May 22
23:14:37 2008
@@ -27,6 +27,7 @@
maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
maven.checkstyle.properties=${basedir}/checkstyle.xml
+maven.checkstyle.header.file=${basedir}/license-header.txt
maven.xdoc.poweredby.image=maven-feather.png
#If you wish to skip tests when doing builds, uncomment
