From 5a3102abdf6b7b74be91daf8056b380d19e051fc Mon Sep 17 00:00:00 2001 From: baerwang <52104949+baerwang@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:49:22 +0800 Subject: [PATCH] style: change license (#2100) --- integrate_test.sh | 19 ++++------------ src/net/src/build_version.cc.in | 5 +++++ src/net/src/http_conn.cc | 1 + src/net/src/net_thread_name.h | 1 + src/net/src/net_util.cc | 1 + src/pstd/src/build_version.cc | 5 +++++ tests/integration/integrate_test.sh | 19 ++++------------ tools/pika-port/build2.sh | 2 +- tools/pika-port/build3.sh | 2 +- tools/pika-port/glog.sh | 2 +- tools/pika_operator/README.md | 22 +++++-------------- .../pika_operator/api/v1alpha1/additional.go | 7 ++++++ .../api/v1alpha1/groupversion_info.go | 17 ++++---------- .../pika_operator/api/v1alpha1/pika_types.go | 17 ++++---------- .../api/v1alpha1/zz_generated.deepcopy.go | 17 ++++---------- .../controllers/pika_controller.go | 17 ++++---------- .../controllers/pika_controller_test.go | 7 ++++++ tools/pika_operator/controllers/suite_test.go | 17 ++++---------- tools/pika_operator/hack/boilerplate.go.txt | 17 ++++---------- tools/pika_operator/main.go | 17 ++++---------- 20 files changed, 72 insertions(+), 140 deletions(-) diff --git a/integrate_test.sh b/integrate_test.sh index cc555b3fd0..e2e3337393 100644 --- a/integrate_test.sh +++ b/integrate_test.sh @@ -1,18 +1,7 @@ -# -# 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. +# Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. #!/bin/bash diff --git a/src/net/src/build_version.cc.in b/src/net/src/build_version.cc.in index cc4026a838..5087b21249 100644 --- a/src/net/src/build_version.cc.in +++ b/src/net/src/build_version.cc.in @@ -1,3 +1,8 @@ +// Copyright (c) 2015-present, Qihoo, Inc. All rights reserved. +// This source code is licensed under the BSD-style license found in the +// LICENSE file in the root directory of this source tree. An additional grant +// of patent rights can be found in the PATENTS file in the same directory. + #include "net/include/build_version.h" const char* net_build_git_sha = "net_build_git_sha:@@GIT_SHA@@"; const char* net_build_git_date = "net_build_git_date:@@GIT_DATE_TIME@@"; diff --git a/src/net/src/http_conn.cc b/src/net/src/http_conn.cc index 027afd5e36..bde5f46177 100644 --- a/src/net/src/http_conn.cc +++ b/src/net/src/http_conn.cc @@ -2,6 +2,7 @@ // This source code is licensed under the BSD-style license found in the // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. + #include "net/include/http_conn.h" #include #include diff --git a/src/net/src/net_thread_name.h b/src/net/src/net_thread_name.h index 355cd66f1a..e85cd1a6df 100644 --- a/src/net/src/net_thread_name.h +++ b/src/net/src/net_thread_name.h @@ -2,6 +2,7 @@ // This source code is licensed under the BSD-style license found in the // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. + #ifndef NET_THREAD_NAME_H #define NET_THREAD_NAME_H diff --git a/src/net/src/net_util.cc b/src/net/src/net_util.cc index 791df31e86..6f1f4692d0 100644 --- a/src/net/src/net_util.cc +++ b/src/net/src/net_util.cc @@ -2,6 +2,7 @@ // This source code is licensed under the BSD-style license found in the // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. + #include "net/src/net_util.h" #include #include diff --git a/src/pstd/src/build_version.cc b/src/pstd/src/build_version.cc index 506f4d3829..7e8f1fd035 100644 --- a/src/pstd/src/build_version.cc +++ b/src/pstd/src/build_version.cc @@ -1,3 +1,8 @@ +// Copyright (c) 2015-present, Qihoo, Inc. All rights reserved. +// This source code is licensed under the BSD-style license found in the +// LICENSE file in the root directory of this source tree. An additional grant +// of patent rights can be found in the PATENTS file in the same directory. + #include "pstd/include/version.h" const char* pstd_build_git_sha = "pstd_build_git_sha:2f67b928b3ccd2f23109802aa9932a7af45abcd9"; const char* pstd_build_git_date = "pstd_build_git_date:2023-03-27"; diff --git a/tests/integration/integrate_test.sh b/tests/integration/integrate_test.sh index 4fbcb92da0..8c3319acec 100755 --- a/tests/integration/integrate_test.sh +++ b/tests/integration/integrate_test.sh @@ -1,18 +1,7 @@ -# -# 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. +# Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. go mod tidy go test \ No newline at end of file diff --git a/tools/pika-port/build2.sh b/tools/pika-port/build2.sh index b41358d50e..8db596c09e 100644 --- a/tools/pika-port/build2.sh +++ b/tools/pika-port/build2.sh @@ -3,7 +3,7 @@ # DESC : pika-port2 build script # AUTHOR : Alex Stocks # VERSION : 1.0 -# LICENCE : Apache License 2.0 +# LICENCE : BSD-3-Clause License # EMAIL : alexstocks@foxmail.com # MOD : 2019-01-22 19:54 # FILE : build.sh diff --git a/tools/pika-port/build3.sh b/tools/pika-port/build3.sh index dbf2133508..1648de2c89 100644 --- a/tools/pika-port/build3.sh +++ b/tools/pika-port/build3.sh @@ -3,7 +3,7 @@ # DESC : pika-port3 build script # AUTHOR : Alex Stocks # VERSION : 1.0 -# LICENCE : Apache License 2.0 +# LICENCE : BSD-3-Clause License # EMAIL : alexstocks@foxmail.com # MOD : 2019-01-22 19:54 # FILE : build.sh diff --git a/tools/pika-port/glog.sh b/tools/pika-port/glog.sh index 37b347250e..2c83fbc8e2 100644 --- a/tools/pika-port/glog.sh +++ b/tools/pika-port/glog.sh @@ -3,7 +3,7 @@ # DESC : glog build script # AUTHOR : Alex Stocks # VERSION : 1.0 -# LICENCE : Apache License 2.0 +# LICENCE : BSD-3-Clause License # EMAIL : alexstocks@foxmail.com # MOD : 2019-01-22 19:54 # FILE : build.sh diff --git a/tools/pika_operator/README.md b/tools/pika_operator/README.md index 23bc83435c..b5fd5c10d5 100644 --- a/tools/pika_operator/README.md +++ b/tools/pika_operator/README.md @@ -13,7 +13,7 @@ It is responsible for creating and managing the following resources: ## Getting Started -You’ll need a Kubernetes cluster to run against. You can use [MiniKube](https://minikube.sigs.k8s.io) +You’ll need a Kubernetes cluster to run against. You can use [MiniKube](https://minikube.sigs.k8s.io) or [KIND](https://kind.sigs.k8s.io) to get a local cluster for testing, or run against a remote cluster. **Note:** Your controller will automatically use the current context in your kubeconfig file (i.e. whatever @@ -22,7 +22,7 @@ cluster `kubectl cluster-info` shows). ### Running locally with MiniKube 1. Install [MiniKube](https://minikube.sigs.k8s.io/docs/start/) - + 2. Start a local cluster: ```sh @@ -147,17 +147,7 @@ More information can be found via the [Kubebuilder Documentation](https://book.k ## License -Copyright 2023. - -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. - +Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +This source code is licensed under the BSD-style license found in the +LICENSE file in the root directory of this source tree. An additional grant +of patent rights can be found in the PATENTS file in the same directory. diff --git a/tools/pika_operator/api/v1alpha1/additional.go b/tools/pika_operator/api/v1alpha1/additional.go index 88774895c9..79b3552db1 100644 --- a/tools/pika_operator/api/v1alpha1/additional.go +++ b/tools/pika_operator/api/v1alpha1/additional.go @@ -1,3 +1,10 @@ +/* +Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +This source code is licensed under the BSD-style license found in the +LICENSE file in the root directory of this source tree. An additional grant +of patent rights can be found in the PATENTS file in the same directory. +*/ + package v1alpha1 const ( diff --git a/tools/pika_operator/api/v1alpha1/groupversion_info.go b/tools/pika_operator/api/v1alpha1/groupversion_info.go index 1686366033..b8d980b7aa 100644 --- a/tools/pika_operator/api/v1alpha1/groupversion_info.go +++ b/tools/pika_operator/api/v1alpha1/groupversion_info.go @@ -1,17 +1,8 @@ /* -Copyright 2023. - -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. +Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +This source code is licensed under the BSD-style license found in the +LICENSE file in the root directory of this source tree. An additional grant +of patent rights can be found in the PATENTS file in the same directory. */ // Package v1alpha1 contains API Schema definitions for the pika v1alpha1 API group diff --git a/tools/pika_operator/api/v1alpha1/pika_types.go b/tools/pika_operator/api/v1alpha1/pika_types.go index d14f53536a..0181424863 100644 --- a/tools/pika_operator/api/v1alpha1/pika_types.go +++ b/tools/pika_operator/api/v1alpha1/pika_types.go @@ -1,17 +1,8 @@ /* -Copyright 2023. - -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. +Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +This source code is licensed under the BSD-style license found in the +LICENSE file in the root directory of this source tree. An additional grant +of patent rights can be found in the PATENTS file in the same directory. */ package v1alpha1 diff --git a/tools/pika_operator/api/v1alpha1/zz_generated.deepcopy.go b/tools/pika_operator/api/v1alpha1/zz_generated.deepcopy.go index 062f4d1458..f1b8b25e64 100644 --- a/tools/pika_operator/api/v1alpha1/zz_generated.deepcopy.go +++ b/tools/pika_operator/api/v1alpha1/zz_generated.deepcopy.go @@ -2,19 +2,10 @@ // +build !ignore_autogenerated /* -Copyright 2023. - -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. +Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +This source code is licensed under the BSD-style license found in the +LICENSE file in the root directory of this source tree. An additional grant +of patent rights can be found in the PATENTS file in the same directory. */ // Code generated by controller-gen. DO NOT EDIT. diff --git a/tools/pika_operator/controllers/pika_controller.go b/tools/pika_operator/controllers/pika_controller.go index f0e50b87c7..e263ad80ca 100644 --- a/tools/pika_operator/controllers/pika_controller.go +++ b/tools/pika_operator/controllers/pika_controller.go @@ -1,17 +1,8 @@ /* -Copyright 2023. - -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. +Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +This source code is licensed under the BSD-style license found in the +LICENSE file in the root directory of this source tree. An additional grant +of patent rights can be found in the PATENTS file in the same directory. */ package controllers diff --git a/tools/pika_operator/controllers/pika_controller_test.go b/tools/pika_operator/controllers/pika_controller_test.go index 2d1afa3adc..981a68bec5 100644 --- a/tools/pika_operator/controllers/pika_controller_test.go +++ b/tools/pika_operator/controllers/pika_controller_test.go @@ -1,3 +1,10 @@ +/* +Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +This source code is licensed under the BSD-style license found in the +LICENSE file in the root directory of this source tree. An additional grant +of patent rights can be found in the PATENTS file in the same directory. +*/ + package controllers import ( diff --git a/tools/pika_operator/controllers/suite_test.go b/tools/pika_operator/controllers/suite_test.go index 55367f4605..1fc54ac7ab 100644 --- a/tools/pika_operator/controllers/suite_test.go +++ b/tools/pika_operator/controllers/suite_test.go @@ -1,17 +1,8 @@ /* -Copyright 2023. - -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. +Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +This source code is licensed under the BSD-style license found in the +LICENSE file in the root directory of this source tree. An additional grant +of patent rights can be found in the PATENTS file in the same directory. */ package controllers diff --git a/tools/pika_operator/hack/boilerplate.go.txt b/tools/pika_operator/hack/boilerplate.go.txt index 65b8622718..8e060b602d 100644 --- a/tools/pika_operator/hack/boilerplate.go.txt +++ b/tools/pika_operator/hack/boilerplate.go.txt @@ -1,15 +1,6 @@ /* -Copyright 2023. - -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. +Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +This source code is licensed under the BSD-style license found in the +LICENSE file in the root directory of this source tree. An additional grant +of patent rights can be found in the PATENTS file in the same directory. */ \ No newline at end of file diff --git a/tools/pika_operator/main.go b/tools/pika_operator/main.go index 292d811708..a7b796e2d5 100644 --- a/tools/pika_operator/main.go +++ b/tools/pika_operator/main.go @@ -1,17 +1,8 @@ /* -Copyright 2023. - -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. +Copyright (c) 2023-present, Qihoo, Inc. All rights reserved. +This source code is licensed under the BSD-style license found in the +LICENSE file in the root directory of this source tree. An additional grant +of patent rights can be found in the PATENTS file in the same directory. */ package main