From db9759fcc2d76977426f1328f36b7590f314db69 Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Fri, 16 Aug 2019 14:37:44 +0800
Subject: [PATCH] Check license header strictly (#3274)

* Check license header strictly

* Ignore header template

* Include more files to check list
---
 apm-checkstyle/CHECKSTYLE_HEAD                | 35 ++++++++++---------
 apm-checkstyle/checkStyle.xml                 |  6 ++++
 .../apm/agent/core/base64/Base64.java         |  4 +--
 apm-webapp/src/main/resources/application.yml | 14 ++++----
 .../src/test/resources/alarm-settings.yml     | 13 ++++---
 .../src/test/resources/application.yml        | 14 ++++----
 .../src/test/resources/application.yml        | 14 ++++----
 .../src/test/resources/application.yml        | 14 ++++----
 .../src/test/resources/application.yml        | 13 ++++---
 ...g.oap.server.library.module.ModuleProvider |  0
 .../test/resources/component-libraries.yml    | 13 ++++---
 .../src/test/resources/application.yml        | 13 ++++---
 .../src/main/resources/alarm-settings.yml     | 13 ++++---
 .../src/main/resources/application.yml        | 13 ++++---
 .../main/resources/component-libraries.yml    | 13 ++++---
 .../resources/datasource-settings.properties  |  0
 ...g.oap.server.library.module.ModuleProvider | 18 ----------
 pom.xml                                       |  9 +++++
 18 files changed, 105 insertions(+), 114 deletions(-)
 mode change 100644 => 100755 apm-checkstyle/CHECKSTYLE_HEAD
 mode change 100644 => 100755 apm-checkstyle/checkStyle.xml
 mode change 100644 => 100755 apm-webapp/src/main/resources/application.yml
 mode change 100644 => 100755 oap-server/server-alarm-plugin/src/test/resources/alarm-settings.yml
 mode change 100644 => 100755 oap-server/server-configuration/configuration-apollo/src/test/resources/application.yml
 mode change 100644 => 100755 oap-server/server-configuration/configuration-etcd/src/test/resources/application.yml
 mode change 100644 => 100755 oap-server/server-configuration/configuration-nacos/src/test/resources/application.yml
 mode change 100644 => 100755 oap-server/server-configuration/configuration-zookeeper/src/test/resources/application.yml
 mode change 100644 => 100755 oap-server/server-core/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
 mode change 100644 => 100755 oap-server/server-core/src/test/resources/component-libraries.yml
 mode change 100644 => 100755 oap-server/server-library/library-util/src/test/resources/application.yml
 mode change 100644 => 100755 oap-server/server-starter/src/main/resources/alarm-settings.yml
 mode change 100644 => 100755 oap-server/server-starter/src/main/resources/application.yml
 mode change 100644 => 100755 oap-server/server-starter/src/main/resources/component-libraries.yml
 mode change 100644 => 100755 oap-server/server-starter/src/main/resources/datasource-settings.properties
 mode change 100644 => 100755 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider

diff --git a/apm-checkstyle/CHECKSTYLE_HEAD b/apm-checkstyle/CHECKSTYLE_HEAD
old mode 100644
new mode 100755
index 70774e004..00e3b0954
--- a/apm-checkstyle/CHECKSTYLE_HEAD
+++ b/apm-checkstyle/CHECKSTYLE_HEAD
@@ -1,17 +1,18 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- *
- */
+^<\?xml version="1\.0" encoding="UTF-8"\?>$
+^<!--$
+^ *(/\*|#|~)$
+^ *(\*|#|~) +Licensed to the Apache Software Foundation \(ASF\) under one or more$
+^ *(\*|#|~) +contributor license agreements\.  See the NOTICE file distributed with$
+^ *(\*|#|~) +this work for additional information regarding copyright ownership\.$
+^ *(\*|#|~) +The ASF licenses this file to You 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\.$
+^ *(\*|#|~)$
diff --git a/apm-checkstyle/checkStyle.xml b/apm-checkstyle/checkStyle.xml
old mode 100644
new mode 100755
index 6d868caa8..bc6d3bf20
--- a/apm-checkstyle/checkStyle.xml
+++ b/apm-checkstyle/checkStyle.xml
@@ -110,4 +110,10 @@
             <property name="path" value="apm-sniffer/(apm-sdk-plugin|optional-plugins)/.+/src/main/.+Instrumentation.java$" />
         </module>
     </module>
+
+    <module name="RegexpHeader">
+        <property name="headerFile" value="${checkstyle.header.file}"/>
+        <property name="multiLines" value="1, 2, 3, 18"/>
+    </module>
+
 </module>
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java
index 2a526daaa..2f179097c 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java
@@ -1,10 +1,10 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.    See the NOTICE file distributed with
+ * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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
+ * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/apm-webapp/src/main/resources/application.yml b/apm-webapp/src/main/resources/application.yml
old mode 100644
new mode 100755
index 0f46dcb6e..b885b4816
--- a/apm-webapp/src/main/resources/application.yml
+++ b/apm-webapp/src/main/resources/application.yml
@@ -1,10 +1,9 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #
@@ -14,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 server:
   port: 8080
 
diff --git a/oap-server/server-alarm-plugin/src/test/resources/alarm-settings.yml b/oap-server/server-alarm-plugin/src/test/resources/alarm-settings.yml
old mode 100644
new mode 100755
index 4282a7f4e..d46b17131
--- a/oap-server/server-alarm-plugin/src/test/resources/alarm-settings.yml
+++ b/oap-server/server-alarm-plugin/src/test/resources/alarm-settings.yml
@@ -1,10 +1,9 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #
diff --git a/oap-server/server-configuration/configuration-apollo/src/test/resources/application.yml b/oap-server/server-configuration/configuration-apollo/src/test/resources/application.yml
old mode 100644
new mode 100755
index 6824cd744..cee43e583
--- a/oap-server/server-configuration/configuration-apollo/src/test/resources/application.yml
+++ b/oap-server/server-configuration/configuration-apollo/src/test/resources/application.yml
@@ -1,10 +1,9 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #
@@ -14,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 test-module:
   default:
     testKey: 300
diff --git a/oap-server/server-configuration/configuration-etcd/src/test/resources/application.yml b/oap-server/server-configuration/configuration-etcd/src/test/resources/application.yml
old mode 100644
new mode 100755
index be3009c89..e4e19817e
--- a/oap-server/server-configuration/configuration-etcd/src/test/resources/application.yml
+++ b/oap-server/server-configuration/configuration-etcd/src/test/resources/application.yml
@@ -1,10 +1,9 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #
@@ -14,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 test-module:
   default:
     testKey: 300
diff --git a/oap-server/server-configuration/configuration-nacos/src/test/resources/application.yml b/oap-server/server-configuration/configuration-nacos/src/test/resources/application.yml
old mode 100644
new mode 100755
index fb9624de5..49810f576
--- a/oap-server/server-configuration/configuration-nacos/src/test/resources/application.yml
+++ b/oap-server/server-configuration/configuration-nacos/src/test/resources/application.yml
@@ -1,10 +1,9 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #
@@ -14,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 test-module:
   default:
     testKey: 300
diff --git a/oap-server/server-configuration/configuration-zookeeper/src/test/resources/application.yml b/oap-server/server-configuration/configuration-zookeeper/src/test/resources/application.yml
old mode 100644
new mode 100755
index 5981532b3..b8c16cd4a
--- a/oap-server/server-configuration/configuration-zookeeper/src/test/resources/application.yml
+++ b/oap-server/server-configuration/configuration-zookeeper/src/test/resources/application.yml
@@ -1,10 +1,9 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #
diff --git a/oap-server/server-core/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider b/oap-server/server-core/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
old mode 100644
new mode 100755
diff --git a/oap-server/server-core/src/test/resources/component-libraries.yml b/oap-server/server-core/src/test/resources/component-libraries.yml
old mode 100644
new mode 100755
index fac46d047..c3011ecb2
--- a/oap-server/server-core/src/test/resources/component-libraries.yml
+++ b/oap-server/server-core/src/test/resources/component-libraries.yml
@@ -1,10 +1,9 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #
diff --git a/oap-server/server-library/library-util/src/test/resources/application.yml b/oap-server/server-library/library-util/src/test/resources/application.yml
old mode 100644
new mode 100755
index c2b1c0d08..613ff1125
--- a/oap-server/server-library/library-util/src/test/resources/application.yml
+++ b/oap-server/server-library/library-util/src/test/resources/application.yml
@@ -1,10 +1,9 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #
diff --git a/oap-server/server-starter/src/main/resources/alarm-settings.yml b/oap-server/server-starter/src/main/resources/alarm-settings.yml
old mode 100644
new mode 100755
index 539d3690e..0c224d524
--- a/oap-server/server-starter/src/main/resources/alarm-settings.yml
+++ b/oap-server/server-starter/src/main/resources/alarm-settings.yml
@@ -1,10 +1,9 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
old mode 100644
new mode 100755
index 8e7bd25d0..5ea17c9eb
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -1,10 +1,9 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #
diff --git a/oap-server/server-starter/src/main/resources/component-libraries.yml b/oap-server/server-starter/src/main/resources/component-libraries.yml
old mode 100644
new mode 100755
index 138748493..9a1688181
--- a/oap-server/server-starter/src/main/resources/component-libraries.yml
+++ b/oap-server/server-starter/src/main/resources/component-libraries.yml
@@ -1,10 +1,9 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #
diff --git a/oap-server/server-starter/src/main/resources/datasource-settings.properties b/oap-server/server-starter/src/main/resources/datasource-settings.properties
old mode 100644
new mode 100755
diff --git a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
old mode 100644
new mode 100755
index d982d7fdd..eac6392aa
--- a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
+++ b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
@@ -16,22 +16,4 @@
 #
 #
 
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-#
-
 org.apache.skywalking.oap.server.storage.plugin.jaeger.elasticsearch.JaegerStorageModuleElasticsearchProvider
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7681cb59d..e7df6278a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -423,6 +423,7 @@
                         <!-- Maven Wrapper generated files -->
                         <exclude>.mvn/wrapper/maven-wrapper.properties</exclude>
                         <exclude>tools/dependencies/known-oap-backend-dependencies.txt</exclude>
+                        <exclude>apm-checkstyle/CHECKSTYLE_HEAD</exclude>
                     </excludes>
                 </configuration>
                 <executions>
@@ -506,6 +507,14 @@
                     <includeTestSourceDirectory>true</includeTestSourceDirectory>
                     <failsOnError>true</failsOnError>
                     <includes>org/apache/skywalking/**/*.java</includes>
+                    <resourceIncludes>
+                        **/*.properties,
+                        **/*.sh,
+                        **/*.bat,
+                        **/*.yml,
+                        **/*.yaml,
+                        **/*.xml
+                    </resourceIncludes>
                     <excludes>
                         org/apache/skywalking/apm/network/register/v2/**/*.java,
                         org/apache/skywalking/apm/network/common/**/*.java,