Add copyright part to header check (#3311)

fixes #3300

Author: ahornace

dev/checkstyle/fileheader.txt

@@ -1,19 +1,23 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * See LICENSE.txt included in this distribution for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at LICENSE.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
+/\*
+ \* CDDL HEADER START
+ \*
+ \* The contents of this file are subject to the terms of the
+ \* Common Development and Distribution License \(the "License"\)\.
+ \* You may not use this file except in compliance with the License\.
+ \*
+ \* See LICENSE\.txt included in this distribution for the specific
+ \* language governing permissions and limitations under the License\.
+ \*
+ \* When distributing Covered Code, include this CDDL HEADER in each
+ \* file and include the License file at LICENSE\.txt\.
+ \* If applicable, add the following below this CDDL HEADER, with the
+ \* fields enclosed by brackets "\[\]" replaced with your own identifying
+ \* information: Portions Copyright \[yyyy\] \[name of copyright owner\]
+ \*
+ \* CDDL HEADER END
+ \*/
 
+/\*
+ \* (Portions )?Copyright \(c\) \d\d\d\d(, \d\d\d\d)?, [^0-9].*\.
+ \*/
+package .*;

dev/checkstyle/style.xml

@@ -6,8 +6,9 @@
     <module name="NewlineAtEndOfFile">
         <property name="severity" value="ignore" />
     </module>
-    <module name="Header">
+    <module name="RegexpHeader">
         <property name="headerFile" value="${checkstyle.header.file}"/>
+        <property name="multiLines" value="21"/>
     </module>
     <module name="FileLength"/>
     <module name="FileTabCharacter"/>

dev/checkstyle/suppressions.xml

@@ -34,7 +34,9 @@ Portions Copyright (c) 2018-2020, Chris Fraire <[email protected]>.
         |ObjectPool\.java|ObjectValidator\.java|ObjectFactory\.java|AbstractObjectPool\.java|
         |BlockingObjectPool\.java|OGKTextVecField\.java|OGKTextField\.java|
         |LazilyInstantiate\.java|PortChecker\.java|CloseableReentrantReadWriteLock\.java|
-        |ResourceLock\.java|ZeroReader\.java" />
+        |ResourceLock\.java|ZeroReader\.java|ColorUtil\.java|RainbowColorGenerator\.java|WildCardMatcher.java|
+        |BitKeeperAnnotationParser\.java|BitKeeperTagEntry\.java|BitKeeperTagParser\.java|BooleanUtilTest\.java|
+        |CorsEnable\.java|CorsFilter\.java" />
 
     <suppress checks="ParameterNumber" files="CtagsReader\.java|Definitions\.java|
         |JFlexXrefUtils\.java|FileAnalyzerFactory\.java|SearchController\.java|

opengrok-indexer/src/main/java/org/opengrok/indexer/Metrics.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.indexer;
 

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AbstractAnalyzer.java

@@ -18,9 +18,8 @@
  */
 
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- * Portions Copyright (c) 2017-2020, Chris Fraire <[email protected]>.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. Use is subject to license terms.
+ * Portions Copyright (c) 2017, 2020, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;
 

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerFactory.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017, 2018, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;
 

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerGuru.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017-2020, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017, 2020, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;
 

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerGuruHelp.java

@@ -18,9 +18,8 @@
  */
 
 /*
- * Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
+ * Copyright (c) 2017, 2019, Chris Fraire <[email protected]>.
  */
-
 package org.opengrok.indexer.analysis;
 
 import org.opengrok.indexer.util.StringUtils;

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/CompatibleAnalyser.java

@@ -17,7 +17,7 @@
  * CDDL HEADER END
  */
 
- /*
+/*
  * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, 2020, Chris Fraire <[email protected]>.
  */

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java

@@ -17,9 +17,9 @@
  * CDDL HEADER END
  */
 
- /*
+/*
  * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017-2020, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017, 2020, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;