From beae2e989199154cce87e222efd26447dc2a8f02 Mon Sep 17 00:00:00 2001
From: Niall Pemberton <niallp@apache.org>
Date: Fri, 23 May 2008 06:14:37 +0000
Subject: [PATCH] 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)

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_0@659441 13f79535-47bb-0310-9956-ffa450edef68
---
 checkstyle.xml     | 3 +--
 pom.xml            | 7 ++++---
 project.properties | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index 4c39a7f94..db1e638ef 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -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 -->
diff --git a/pom.xml b/pom.xml
index fa5f85cbf..a50780c4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/project.properties b/project.properties
index 6c00c155b..772a6a08b 100644
--- a/project.properties
+++ b/project.properties
@@ -27,6 +27,7 @@ maven.repo.remote=http://repo1.maven.org/maven
 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