svn commit: r464756 - in /shale/maven/trunk/build: LICENSE.CheckStyle shale_checks.xml

[ra...@apache.org]

Author: rahul
Date: Mon Oct 16 17:25:40 2006
New Revision: 464756

URL: http://svn.apache.org/viewvc?view=rev&rev=464756
Log:
Update checkstyle config for license headers to match new headers.
SHALE-311

Modified:
    shale/maven/trunk/build/LICENSE.CheckStyle
    shale/maven/trunk/build/shale_checks.xml

Modified: shale/maven/trunk/build/LICENSE.CheckStyle
URL: http://svn.apache.org/viewvc/shale/maven/trunk/build/LICENSE.CheckStyle?view=diff&rev=464756&r1=464755&r2=464756
==============================================================================
--- shale/maven/trunk/build/LICENSE.CheckStyle (original)
+++ shale/maven/trunk/build/LICENSE.CheckStyle Mon Oct 16 17:25:40 2006
@@ -1,9 +1,10 @@
 /\*\s*
- \*\s*Copyright \d{4}(-\d{4}|,\d{4})* The Apache Software Foundation\.
- \*\s*
- \*\s*Licensed under the Apache License, Version 2\.0 \(the "License"\);
- \*\s*you may not use this file except in compliance with the License\.
- \*\s*You may obtain a copy of the License at
+ \*\s*Licensed to the Apache Software Foundation \(ASF\) under one or more
+ \*\s*contributor license agreements.  See the NOTICE file distributed with
+ \*\s*this work for additional information regarding copyright ownership\.
+ \*\s*The ASF licenses this file to you under the Apache License, Version 2\.0
+ \*\s*\(the "License"\); you may not use this file except in compliance with
+ \*\s*the License.  You may obtain a copy of the License at
  \*\s*
  \*\s*http://www\.apache\.org/licenses/LICENSE\-2\.0
  \*\s*

Modified: shale/maven/trunk/build/shale_checks.xml
URL: http://svn.apache.org/viewvc/shale/maven/trunk/build/shale_checks.xml?view=diff&rev=464756&r1=464755&r2=464756
==============================================================================
--- shale/maven/trunk/build/shale_checks.xml (original)
+++ shale/maven/trunk/build/shale_checks.xml Mon Oct 16 17:25:40 2006
@@ -136,7 +136,7 @@
         <!-- <module name="RegexpHeader"/>                                -->
         <module name="RegexpHeader">
             <property name="header"
-                      value="/\*\s*\n \*\s*Copyright \d{4}(-\d{4}|,\d{4})* The Apache Software Foundation\.\n \*\s*\n \*\s*Licensed under the Apache License, Version 2\.0 \(the .License.\);\n \*\s*you may not use this file except in compliance with the License\.\n \*\s*You may obtain a copy of the License at\n \*\s*\n \*\s*http://www\.apache\.org/licenses/LICENSE\-2\.0\n \*\s*\n \*\s*Unless required by applicable law or agreed to in writing, software\n \*\s*distributed under the License is distributed on an .AS IS. BASIS,\n \*\s*WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.\n \*\s*See the License for the specific language governing permissions and\n \*\s*limitations under the License\.\n \*/\s*"/>
+                      value="/\*\s*\n \*\s*Licensed to the Apache Software Foundation \(ASF\) under one or more\n \*\s*contributor license agreements.  See the NOTICE file distributed with\n \*\s*this work for additional information regarding copyright ownership\.\n \*\s*The ASF licenses this file to you under the Apache License, Version 2\.0\n \*\s*\(the .License.\); you may not use this file except in compliance with\n \*\s*the License.  You may obtain a copy of the License at\n \*\s*\n \*\s*http://www\.apache\.org/licenses/LICENSE\-2\.0\n \*\s*\n \*\s*Unless required by applicable law or agreed to in writing, software\n \*\s*distributed under the License is distributed on an .AS IS. BASIS,\n \*\s*WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.\n \*\s*See the License for the specific language governing permissions and\n \*\s*limitations under the License\.\n \*/\s*\n \*/\s*"/>
         </module>
 
         <!-- Checks for imports                              -->