Author: carlos
Date: Wed Jun 21 16:36:46 2006
New Revision: 416173
URL: http://svn.apache.org/viewvc?rev=416173&view=rev
Log:
Externalize and improve the header checkings
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven-header.txt
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven-header.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven-header.txt?rev=416173&r1=416172&r2=416173&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven-header.txt
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven-header.txt
Wed Jun 21 16:36:46 2006
@@ -1,18 +1,18 @@
^package
^$
^/\*$
-^ \* Copyright \d\d\d\d-\d\d\d\d The Apache Software Foundation.$
+^ \* Copyright (\d\d\d\d-)?\d\d\d\d The Apache Software Foundation.$
^ \*$
-^ \* Licensed under the Apache License, Version 2.0 (the "License");$
+^ \* Licensed under the Apache License, Version 2.0 \(the "License"\)\;$
^ \* you may not use this file except in compliance with the License.$
^ \* You may obtain a copy of the License at$
^ \*$
^ \* http://www.apache.org/licenses/LICENSE-2.0$
^ \*$
^ \* Unless required by applicable law or agreed to in writing, software$
-^ \* distributed under the License is distributed on an "AS IS" BASIS,
-^ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-^ \* See the License for the specific language governing permissions and
-^ \* limitations under the License.
-^ \*/
+^ \* distributed under the License is distributed on an "AS IS" BASIS,$
+^ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.$
+^ \* See the License for the specific language governing permissions and$
+^ \* limitations under the License.$
+^ \*/$
^$
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml?rev=416173&r1=416172&r2=416173&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml
Wed Jun 21 16:36:46 2006
@@ -18,8 +18,8 @@
-->
<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_1.dtd";>
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
<!--
Checkstyle configuration that checks the maven coding conventions from:
@@ -86,7 +86,7 @@
<!-- Checks for Headers -->
<!-- See http://checkstyle.sf.net/config_header.html -->
<module name="RegexpHeader">
- <property name="header" value="^package \n^$\n/\*$\n^ \* Copyright
\d\d\d\d-\d\d\d\d The Apache Software Foundation.$\n^ \*$\n^ \* Licensed under
the Apache License, Version 2.0 \(the "License"\)\;$\n^ \* you may
not use this file except in compliance with the License.$\n^ \* You may obtain
a copy of the License at$\n^ \*$\n^ \*
http://www.apache.org/licenses/LICENSE-2.0$\n^ \*$\n^ \* Unless required by
applicable law or agreed to in writing, software$\n^ \* distributed under the
License is distributed on an "AS IS" BASIS,$\n^ \* WITHOUT WARRANTIES
OR CONDITIONS OF ANY KIND, either express or implied.$\n^ \* See the License
for the specific language governing permissions and$\n^ \* limitations under
the License.$\n^ \*/$\n^$"/>
+ <property name="headerFile" value="${checkstyle.header.file}"/>
</module>
<!-- Checks for imports -->
