cmd, ddl: fix license header (pingcap#27707)

DarvenDuan · Sep 2, 2021 · f379c8b · f379c8b
1 parent b35c7bc
commit f379c8b
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 19 deletions.
diff --git a/.github/.licenserc.yaml → .github/licenserc.yml b/.github/.licenserc.yaml → .github/licenserc.yml
@@ -8,7 +8,6 @@ header:
     - '.gitignore'
     - '.gitattributes'
     - '.golangci.yml'
-    - '.licenserc.yaml'
     - 'LICENSES/'
     - '**/*.md'
     - '**/*.json'
@@ -29,13 +28,6 @@ header:
     - '.github/'
     # The license checker think the following 68 files do not have valid header licenses, need to be discussed.
     # Ignore them for now.
-    - 'cmd/explaintest/config.toml'
-    - 'cmd/importer/config.toml'
-    - 'cmd/portgenerator/portgenerator.go'
-    - 'ddl/ddl.go'
-    - 'ddl/ddl_api.go'
-    - 'ddl/mock.go'
-    - 'ddl/options.go'
     - 'executor/aggfuncs/func_stddevpop_test.go'
     - 'executor/aggfuncs/func_stddevsamp_test.go'
     - 'executor/aggfuncs/func_varpop_test.go'

diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml
@@ -20,4 +20,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           log: info
-          config: .github/.licenserc.yaml
+          config: .github/licenserc.yml
diff --git a/cmd/explaintest/config.toml b/cmd/explaintest/config.toml
@@ -1,3 +1,17 @@
+# Copyright 2021 PingCAP, Inc.
+#
+# 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.
+
 lease = "0"
 mem-quota-query = 34359738368
 nested-loop-join-cache-capacity = 20971520

diff --git a/cmd/importer/config.toml b/cmd/importer/config.toml
@@ -1,3 +1,17 @@
+# Copyright 2021 PingCAP, Inc.
+#
+# 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.
+
 # Importer Configuration.
 
 [ddl]

diff --git a/cmd/portgenerator/portgenerator.go b/cmd/portgenerator/portgenerator.go
@@ -1,3 +1,17 @@
+// Copyright 2021 PingCAP, Inc.
+//
+// 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.
+
 package main
 
 import (

diff --git a/ddl/ddl.go b/ddl/ddl.go
@@ -1,7 +1,3 @@
-// Copyright 2013 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSES/QL-LICENSE file.
-
 // Copyright 2015 PingCAP, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Copyright 2013 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSES/QL-LICENSE file.
+
 package ddl
 
 import (

diff --git a/ddl/ddl_api.go b/ddl/ddl_api.go
@@ -1,7 +1,3 @@
-// Copyright 2013 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSES/QL-LICENSE file.
-
 // Copyright 2016 PingCAP, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Copyright 2013 The ql Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSES/QL-LICENSE file.
+
 package ddl
 
 import (

diff --git a/ddl/mock.go b/ddl/mock.go
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://wwm.apache.org/licenses/LICENSE-2.0
+//     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,

diff --git a/ddl/options.go b/ddl/options.go
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://wwm.apache.org/licenses/LICENSE-2.0
+//     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,