From 6f7994ba559efcbb547469bf187fa65ff635b7c8 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 1 May 2004 09:06:04 +0000
Subject: [PATCH] - Ensure plugins are using the correct checkstyle.xml file -
 Ignore lines 1 and 4 from the checkstyle header file

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115116 13f79535-47bb-0310-9956-ffa450edef68
---
 checkstyle-license.txt | 4 ++--
 checkstyle.xml         | 2 +-
 project.properties     | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/checkstyle-license.txt b/checkstyle-license.txt
index af6d1c58..03f7e430 100644
--- a/checkstyle-license.txt
+++ b/checkstyle-license.txt
@@ -1,7 +1,7 @@
-
+[This line is ignored by checkstyle. Put the package declaration here]
 
 /* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+ *   Copyright [year. ex: 2001-2004] The Apache Software Foundation.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
diff --git a/checkstyle.xml b/checkstyle.xml
index fb7964d2..3cc5bf50 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -48,7 +48,7 @@
         <!-- ************************************************************** -->
         <module name="Header">
             <property name="headerFile" value="${maven.checkstyle.header.file}"/>
-            <property name="ignoreLines" value="1,2,3,4,5,6"/>
+            <property name="ignoreLines" value="1, 4"/>
         </module>
         <property name="tabWidth" value="4"/>
         <module name="LeftCurly">
diff --git a/project.properties b/project.properties
index d06d9bf3..7aaa40f2 100644
--- a/project.properties
+++ b/project.properties
@@ -34,6 +34,7 @@ maven.clover.report.xml=true
 
 # Checkstyle plugin settings
 maven.checkstyle.header.file = ${basedir}/../checkstyle-license.txt
+maven.checkstyle.properties = ${basedir}/../checkstyle.xml
 
 # License plugin settings
 maven.license.licenseFile=${basedir}/../LICENSE.txt