diff --git a/virtcontainers/agent.go b/virtcontainers/agent.go index 7a42c0e34..c273c46db 100644 --- a/virtcontainers/agent.go +++ b/virtcontainers/agent.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/agent_test.go b/virtcontainers/agent_test.go index b65e06fdc..108d69f93 100644 --- a/virtcontainers/agent_test.go +++ b/virtcontainers/agent_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/api.go b/virtcontainers/api.go index 0a84e361a..3dd8731e7 100644 --- a/virtcontainers/api.go +++ b/virtcontainers/api.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/api_test.go b/virtcontainers/api_test.go index 788a74cd9..f6eaf5c20 100644 --- a/virtcontainers/api_test.go +++ b/virtcontainers/api_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/asset.go b/virtcontainers/asset.go index 044eeb80f..8294fc5f2 100644 --- a/virtcontainers/asset.go +++ b/virtcontainers/asset.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/asset_test.go b/virtcontainers/asset_test.go index 21a901c49..dd414fec2 100644 --- a/virtcontainers/asset_test.go +++ b/virtcontainers/asset_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/bridge.go b/virtcontainers/bridge.go index dfddd3eee..7c2922265 100644 --- a/virtcontainers/bridge.go +++ b/virtcontainers/bridge.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/bridge_test.go b/virtcontainers/bridge_test.go index 74b8fcc33..570d28f4e 100644 --- a/virtcontainers/bridge_test.go +++ b/virtcontainers/bridge_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/capabilities.go b/virtcontainers/capabilities.go index 9a817cdd0..8760c9969 100644 --- a/virtcontainers/capabilities.go +++ b/virtcontainers/capabilities.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/capabilities_test.go b/virtcontainers/capabilities_test.go index 0b4b9723d..91bde2fe5 100644 --- a/virtcontainers/capabilities_test.go +++ b/virtcontainers/capabilities_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/cc_proxy.go b/virtcontainers/cc_proxy.go index bb1f9eafa..f2df0ca19 100644 --- a/virtcontainers/cc_proxy.go +++ b/virtcontainers/cc_proxy.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/cc_proxy_test.go b/virtcontainers/cc_proxy_test.go index 164fad5be..ba295178a 100644 --- a/virtcontainers/cc_proxy_test.go +++ b/virtcontainers/cc_proxy_test.go @@ -1,16 +1,6 @@ // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/cc_shim.go b/virtcontainers/cc_shim.go index d0cc4cace..c1c31252d 100644 --- a/virtcontainers/cc_shim.go +++ b/virtcontainers/cc_shim.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/cc_shim_test.go b/virtcontainers/cc_shim_test.go index 3d1c01ed0..82e25c98c 100644 --- a/virtcontainers/cc_shim_test.go +++ b/virtcontainers/cc_shim_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/cni.go b/virtcontainers/cni.go index fba20e494..2704521f7 100644 --- a/virtcontainers/cni.go +++ b/virtcontainers/cni.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/cnm.go b/virtcontainers/cnm.go index 83d256c98..85a80332b 100644 --- a/virtcontainers/cnm.go +++ b/virtcontainers/cnm.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/container.go b/virtcontainers/container.go index 0593bac43..38dfab88a 100644 --- a/virtcontainers/container.go +++ b/virtcontainers/container.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/container_test.go b/virtcontainers/container_test.go index 9bffb429c..8aa958001 100644 --- a/virtcontainers/container_test.go +++ b/virtcontainers/container_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/device.go b/virtcontainers/device.go index 123e26259..b47d59bcf 100644 --- a/virtcontainers/device.go +++ b/virtcontainers/device.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/device_test.go b/virtcontainers/device_test.go index 6317f3dfa..82783e35f 100644 --- a/virtcontainers/device_test.go +++ b/virtcontainers/device_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/doc.go b/virtcontainers/doc.go index 75eb601f9..2fad5d638 100644 --- a/virtcontainers/doc.go +++ b/virtcontainers/doc.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // /* diff --git a/virtcontainers/errors.go b/virtcontainers/errors.go index c8bd59dea..dfd633ac0 100644 --- a/virtcontainers/errors.go +++ b/virtcontainers/errors.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/example_pod_run_test.go b/virtcontainers/example_pod_run_test.go index 12cc73378..7ac0658cf 100644 --- a/virtcontainers/example_pod_run_test.go +++ b/virtcontainers/example_pod_run_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers_test diff --git a/virtcontainers/filesystem.go b/virtcontainers/filesystem.go index d474ecf3e..8a4f19bac 100644 --- a/virtcontainers/filesystem.go +++ b/virtcontainers/filesystem.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/filesystem_test.go b/virtcontainers/filesystem_test.go index 5a3f19fd1..edc96109e 100644 --- a/virtcontainers/filesystem_test.go +++ b/virtcontainers/filesystem_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/hack/virtc/main.go b/virtcontainers/hack/virtc/main.go index e483b0a6f..f4aa95a07 100644 --- a/virtcontainers/hack/virtc/main.go +++ b/virtcontainers/hack/virtc/main.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package main diff --git a/virtcontainers/hook.go b/virtcontainers/hook.go index 66c867406..f240c05f8 100644 --- a/virtcontainers/hook.go +++ b/virtcontainers/hook.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/hook/mock/hook.go b/virtcontainers/hook/mock/hook.go index 7df8d9725..e5906aea5 100644 --- a/virtcontainers/hook/mock/hook.go +++ b/virtcontainers/hook/mock/hook.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package main diff --git a/virtcontainers/hook_test.go b/virtcontainers/hook_test.go index 8b8d947a7..7bc5578f9 100644 --- a/virtcontainers/hook_test.go +++ b/virtcontainers/hook_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/hyperstart_agent.go b/virtcontainers/hyperstart_agent.go index cd76aef18..53481d0b9 100644 --- a/virtcontainers/hyperstart_agent.go +++ b/virtcontainers/hyperstart_agent.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/hyperstart_agent_test.go b/virtcontainers/hyperstart_agent_test.go index b669d8a2d..d2a1ea88b 100644 --- a/virtcontainers/hyperstart_agent_test.go +++ b/virtcontainers/hyperstart_agent_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/hypervisor.go b/virtcontainers/hypervisor.go index ef387f937..45990535d 100644 --- a/virtcontainers/hypervisor.go +++ b/virtcontainers/hypervisor.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/hypervisor_test.go b/virtcontainers/hypervisor_test.go index a14892bc0..5a9957eda 100644 --- a/virtcontainers/hypervisor_test.go +++ b/virtcontainers/hypervisor_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/implementation.go b/virtcontainers/implementation.go index 5b6d90bcf..7d7c981d9 100644 --- a/virtcontainers/implementation.go +++ b/virtcontainers/implementation.go @@ -1,16 +1,7 @@ // Copyright (c) 2017 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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. // Description: The true virtcontainers function of the same name. // This indirection is required to allow an alternative implemenation to be diff --git a/virtcontainers/interfaces.go b/virtcontainers/interfaces.go index e32d4822e..8618b8b33 100644 --- a/virtcontainers/interfaces.go +++ b/virtcontainers/interfaces.go @@ -1,16 +1,7 @@ // Copyright (c) 2017 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 virtcontainers diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go index d950758da..f9c3dab4a 100644 --- a/virtcontainers/kata_agent.go +++ b/virtcontainers/kata_agent.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/kata_agent_test.go b/virtcontainers/kata_agent_test.go index 568d7b9d6..aa9f4f458 100644 --- a/virtcontainers/kata_agent_test.go +++ b/virtcontainers/kata_agent_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/kata_builtin_proxy.go b/virtcontainers/kata_builtin_proxy.go index d84f7cc3a..95f6e092a 100644 --- a/virtcontainers/kata_builtin_proxy.go +++ b/virtcontainers/kata_builtin_proxy.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 HyperHQ 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/kata_builtin_shim.go b/virtcontainers/kata_builtin_shim.go index 0c41d633a..5879e5502 100644 --- a/virtcontainers/kata_builtin_shim.go +++ b/virtcontainers/kata_builtin_shim.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 HyperHQ 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/kata_proxy.go b/virtcontainers/kata_proxy.go index fbdd92fff..a4c488e00 100644 --- a/virtcontainers/kata_proxy.go +++ b/virtcontainers/kata_proxy.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/kata_shim.go b/virtcontainers/kata_shim.go index 9f1693e12..d8f17b081 100644 --- a/virtcontainers/kata_shim.go +++ b/virtcontainers/kata_shim.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/kata_shim_test.go b/virtcontainers/kata_shim_test.go index 4ae1057f3..6dd3bb289 100644 --- a/virtcontainers/kata_shim_test.go +++ b/virtcontainers/kata_shim_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/mock_hypervisor.go b/virtcontainers/mock_hypervisor.go index 667d66710..15bc8e9b5 100644 --- a/virtcontainers/mock_hypervisor.go +++ b/virtcontainers/mock_hypervisor.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/mock_hypervisor_test.go b/virtcontainers/mock_hypervisor_test.go index 48d6b28e4..746b472fa 100644 --- a/virtcontainers/mock_hypervisor_test.go +++ b/virtcontainers/mock_hypervisor_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/mount.go b/virtcontainers/mount.go index e348d1b04..da512779a 100644 --- a/virtcontainers/mount.go +++ b/virtcontainers/mount.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/mount_test.go b/virtcontainers/mount_test.go index 89ee65dd1..d907b1125 100644 --- a/virtcontainers/mount_test.go +++ b/virtcontainers/mount_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/network.go b/virtcontainers/network.go index 281f47de2..26df77dbd 100644 --- a/virtcontainers/network.go +++ b/virtcontainers/network.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/network_test.go b/virtcontainers/network_test.go index 1cb04b835..b204b862a 100644 --- a/virtcontainers/network_test.go +++ b/virtcontainers/network_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/no_proxy.go b/virtcontainers/no_proxy.go index 2f4fff284..69dec3ef9 100644 --- a/virtcontainers/no_proxy.go +++ b/virtcontainers/no_proxy.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/no_proxy_test.go b/virtcontainers/no_proxy_test.go index 455c4f663..8e3f04b05 100644 --- a/virtcontainers/no_proxy_test.go +++ b/virtcontainers/no_proxy_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/noop_agent.go b/virtcontainers/noop_agent.go index 7071d375b..eff024cc8 100644 --- a/virtcontainers/noop_agent.go +++ b/virtcontainers/noop_agent.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/noop_agent_test.go b/virtcontainers/noop_agent_test.go index f0a5603f3..f4e193ee2 100644 --- a/virtcontainers/noop_agent_test.go +++ b/virtcontainers/noop_agent_test.go @@ -1,17 +1,7 @@ // // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/noop_network.go b/virtcontainers/noop_network.go index 7caff5d4f..67c98fb10 100644 --- a/virtcontainers/noop_network.go +++ b/virtcontainers/noop_network.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/noop_proxy.go b/virtcontainers/noop_proxy.go index f1bb83b19..84f36c5e2 100644 --- a/virtcontainers/noop_proxy.go +++ b/virtcontainers/noop_proxy.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/noop_shim.go b/virtcontainers/noop_shim.go index e7d34c163..082c43e5a 100644 --- a/virtcontainers/noop_shim.go +++ b/virtcontainers/noop_shim.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/noop_shim_test.go b/virtcontainers/noop_shim_test.go index f34e800c6..991640cdd 100644 --- a/virtcontainers/noop_shim_test.go +++ b/virtcontainers/noop_shim_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/nsenter.go b/virtcontainers/nsenter.go index 9c9f648ea..d89b55ac9 100644 --- a/virtcontainers/nsenter.go +++ b/virtcontainers/nsenter.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/nsenter_test.go b/virtcontainers/nsenter_test.go index 6061dc734..e49880a04 100644 --- a/virtcontainers/nsenter_test.go +++ b/virtcontainers/nsenter_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/pkg/annotations/annotations.go b/virtcontainers/pkg/annotations/annotations.go index 7a99b83ba..5fc601bae 100644 --- a/virtcontainers/pkg/annotations/annotations.go +++ b/virtcontainers/pkg/annotations/annotations.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package annotations diff --git a/virtcontainers/pkg/annotations/dockershim/annotations.go b/virtcontainers/pkg/annotations/dockershim/annotations.go index ce2d48cf1..e09275d36 100644 --- a/virtcontainers/pkg/annotations/dockershim/annotations.go +++ b/virtcontainers/pkg/annotations/dockershim/annotations.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package dockershim diff --git a/virtcontainers/pkg/cni/cni.go b/virtcontainers/pkg/cni/cni.go index e180a66a0..c98ac557e 100644 --- a/virtcontainers/pkg/cni/cni.go +++ b/virtcontainers/pkg/cni/cni.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package cni diff --git a/virtcontainers/pkg/cni/cni_test.go b/virtcontainers/pkg/cni/cni_test.go index cf2072ddd..609179aec 100644 --- a/virtcontainers/pkg/cni/cni_test.go +++ b/virtcontainers/pkg/cni/cni_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package cni diff --git a/virtcontainers/pkg/hyperstart/hyperstart.go b/virtcontainers/pkg/hyperstart/hyperstart.go index 57f7c2730..36474566e 100644 --- a/virtcontainers/pkg/hyperstart/hyperstart.go +++ b/virtcontainers/pkg/hyperstart/hyperstart.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package hyperstart diff --git a/virtcontainers/pkg/hyperstart/hyperstart_test.go b/virtcontainers/pkg/hyperstart/hyperstart_test.go index a9c210337..56c155f70 100644 --- a/virtcontainers/pkg/hyperstart/hyperstart_test.go +++ b/virtcontainers/pkg/hyperstart/hyperstart_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package hyperstart_test diff --git a/virtcontainers/pkg/hyperstart/mock/hyperstart.go b/virtcontainers/pkg/hyperstart/mock/hyperstart.go index 09177fe7e..8714849a1 100644 --- a/virtcontainers/pkg/hyperstart/mock/hyperstart.go +++ b/virtcontainers/pkg/hyperstart/mock/hyperstart.go @@ -1,16 +1,7 @@ // Copyright (c) 2016 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 mock diff --git a/virtcontainers/pkg/hyperstart/mock/misc.go b/virtcontainers/pkg/hyperstart/mock/misc.go index 26ef34de5..1c1e16a6b 100644 --- a/virtcontainers/pkg/hyperstart/mock/misc.go +++ b/virtcontainers/pkg/hyperstart/mock/misc.go @@ -1,16 +1,7 @@ // Copyright (c) 2016 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 mock diff --git a/virtcontainers/pkg/hyperstart/mock/rand.go b/virtcontainers/pkg/hyperstart/mock/rand.go index 29193b115..1f04de41b 100644 --- a/virtcontainers/pkg/hyperstart/mock/rand.go +++ b/virtcontainers/pkg/hyperstart/mock/rand.go @@ -1,16 +1,7 @@ // Copyright (c) 2016 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 mock diff --git a/virtcontainers/pkg/hyperstart/multicast.go b/virtcontainers/pkg/hyperstart/multicast.go index cedb86eaf..c416ff001 100644 --- a/virtcontainers/pkg/hyperstart/multicast.go +++ b/virtcontainers/pkg/hyperstart/multicast.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package hyperstart diff --git a/virtcontainers/pkg/hyperstart/types.go b/virtcontainers/pkg/hyperstart/types.go index 5c2ccc437..68c28ea61 100644 --- a/virtcontainers/pkg/hyperstart/types.go +++ b/virtcontainers/pkg/hyperstart/types.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package hyperstart diff --git a/virtcontainers/pkg/mock/cc_proxy_mock.go b/virtcontainers/pkg/mock/cc_proxy_mock.go index 743e3ffa8..052612ade 100644 --- a/virtcontainers/pkg/mock/cc_proxy_mock.go +++ b/virtcontainers/pkg/mock/cc_proxy_mock.go @@ -1,16 +1,7 @@ // Copyright (c) 2018 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 mock diff --git a/virtcontainers/pkg/mock/mock.go b/virtcontainers/pkg/mock/mock.go index c78b70168..69c66aa9e 100644 --- a/virtcontainers/pkg/mock/mock.go +++ b/virtcontainers/pkg/mock/mock.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package mock diff --git a/virtcontainers/pkg/nsenter/nsenter.go b/virtcontainers/pkg/nsenter/nsenter.go index ffcfbfb69..20824c13e 100644 --- a/virtcontainers/pkg/nsenter/nsenter.go +++ b/virtcontainers/pkg/nsenter/nsenter.go @@ -1,18 +1,7 @@ -// // Copyright (c) 2018 Intel Corporation // Copyright 2015-2017 CNI authors // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package nsenter diff --git a/virtcontainers/pkg/nsenter/nsenter_test.go b/virtcontainers/pkg/nsenter/nsenter_test.go index 220d9c63d..8d277520c 100644 --- a/virtcontainers/pkg/nsenter/nsenter_test.go +++ b/virtcontainers/pkg/nsenter/nsenter_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package nsenter diff --git a/virtcontainers/pkg/oci/utils.go b/virtcontainers/pkg/oci/utils.go index fe53f73bc..c39c4a9ff 100644 --- a/virtcontainers/pkg/oci/utils.go +++ b/virtcontainers/pkg/oci/utils.go @@ -1,16 +1,7 @@ // Copyright (c) 2017 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 oci diff --git a/virtcontainers/pkg/oci/utils_test.go b/virtcontainers/pkg/oci/utils_test.go index 7c9f7df3b..80f051847 100644 --- a/virtcontainers/pkg/oci/utils_test.go +++ b/virtcontainers/pkg/oci/utils_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package oci diff --git a/virtcontainers/pkg/oci/utils_test_config.go b/virtcontainers/pkg/oci/utils_test_config.go index a7acb18ca..3dd2cd31c 100644 --- a/virtcontainers/pkg/oci/utils_test_config.go +++ b/virtcontainers/pkg/oci/utils_test_config.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package oci diff --git a/virtcontainers/pkg/uuid/uuid.go b/virtcontainers/pkg/uuid/uuid.go index c7df53a42..6c4c651a8 100644 --- a/virtcontainers/pkg/uuid/uuid.go +++ b/virtcontainers/pkg/uuid/uuid.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // // Package uuid can be used to generate 128 bit UUIDs compatible with diff --git a/virtcontainers/pkg/uuid/uuid_test.go b/virtcontainers/pkg/uuid/uuid_test.go index 1d44b75fc..0d39b92de 100644 --- a/virtcontainers/pkg/uuid/uuid_test.go +++ b/virtcontainers/pkg/uuid/uuid_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package uuid diff --git a/virtcontainers/pkg/vcmock/container.go b/virtcontainers/pkg/vcmock/container.go index 8da24bc03..d93c27181 100644 --- a/virtcontainers/pkg/vcmock/container.go +++ b/virtcontainers/pkg/vcmock/container.go @@ -1,16 +1,7 @@ // Copyright (c) 2017 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 vcmock diff --git a/virtcontainers/pkg/vcmock/mock.go b/virtcontainers/pkg/vcmock/mock.go index 0a9814195..938ec44a6 100644 --- a/virtcontainers/pkg/vcmock/mock.go +++ b/virtcontainers/pkg/vcmock/mock.go @@ -1,16 +1,7 @@ // Copyright (c) 2017 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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. // Description: A mock implementation of virtcontainers that can be used // for testing. diff --git a/virtcontainers/pkg/vcmock/mock_test.go b/virtcontainers/pkg/vcmock/mock_test.go index be3d3759e..226dc9d8e 100644 --- a/virtcontainers/pkg/vcmock/mock_test.go +++ b/virtcontainers/pkg/vcmock/mock_test.go @@ -1,16 +1,7 @@ // Copyright (c) 2017 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 vcmock diff --git a/virtcontainers/pkg/vcmock/sandbox.go b/virtcontainers/pkg/vcmock/sandbox.go index 3c7ec68b8..873b66a5e 100644 --- a/virtcontainers/pkg/vcmock/sandbox.go +++ b/virtcontainers/pkg/vcmock/sandbox.go @@ -1,16 +1,7 @@ // Copyright (c) 2017 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 vcmock diff --git a/virtcontainers/pkg/vcmock/types.go b/virtcontainers/pkg/vcmock/types.go index 37df12a7d..f94cce5c7 100644 --- a/virtcontainers/pkg/vcmock/types.go +++ b/virtcontainers/pkg/vcmock/types.go @@ -1,16 +1,7 @@ // Copyright (c) 2017 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 vcmock diff --git a/virtcontainers/pkg/vcmock/utils.go b/virtcontainers/pkg/vcmock/utils.go index c41068a7a..d2e5433f3 100644 --- a/virtcontainers/pkg/vcmock/utils.go +++ b/virtcontainers/pkg/vcmock/utils.go @@ -1,16 +1,7 @@ // Copyright (c) 2017 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 vcmock diff --git a/virtcontainers/proxy.go b/virtcontainers/proxy.go index 35a7665ba..eeb58ee41 100644 --- a/virtcontainers/proxy.go +++ b/virtcontainers/proxy.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/proxy_test.go b/virtcontainers/proxy_test.go index 768dfa45a..8af297737 100644 --- a/virtcontainers/proxy_test.go +++ b/virtcontainers/proxy_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go index 3fd1cbe06..32167b7c4 100644 --- a/virtcontainers/qemu.go +++ b/virtcontainers/qemu.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/qemu_amd64.go b/virtcontainers/qemu_amd64.go index 24650c866..1a73f230a 100644 --- a/virtcontainers/qemu_amd64.go +++ b/virtcontainers/qemu_amd64.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/qemu_amd64_test.go b/virtcontainers/qemu_amd64_test.go index 89898df4c..751047bca 100644 --- a/virtcontainers/qemu_amd64_test.go +++ b/virtcontainers/qemu_amd64_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/qemu_arch_base.go b/virtcontainers/qemu_arch_base.go index 81fcf8a8e..71189574e 100644 --- a/virtcontainers/qemu_arch_base.go +++ b/virtcontainers/qemu_arch_base.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/qemu_arch_base_test.go b/virtcontainers/qemu_arch_base_test.go index 9774d2a4b..6dcc0723b 100644 --- a/virtcontainers/qemu_arch_base_test.go +++ b/virtcontainers/qemu_arch_base_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/qemu_arm64.go b/virtcontainers/qemu_arm64.go index e38916da6..2b80440b5 100644 --- a/virtcontainers/qemu_arm64.go +++ b/virtcontainers/qemu_arm64.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/qemu_test.go b/virtcontainers/qemu_test.go index 3670f1c62..367c724f5 100644 --- a/virtcontainers/qemu_test.go +++ b/virtcontainers/qemu_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go index 01eb69a59..4195db674 100644 --- a/virtcontainers/sandbox.go +++ b/virtcontainers/sandbox.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/sandbox_test.go b/virtcontainers/sandbox_test.go index be36b40ac..ab12b5839 100644 --- a/virtcontainers/sandbox_test.go +++ b/virtcontainers/sandbox_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/sandboxlist.go b/virtcontainers/sandboxlist.go index d6b73c5f2..d67b4d21f 100644 --- a/virtcontainers/sandboxlist.go +++ b/virtcontainers/sandboxlist.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 HyperHQ 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/sandboxlist_test.go b/virtcontainers/sandboxlist_test.go index 6cfbd733b..c320fb3ee 100644 --- a/virtcontainers/sandboxlist_test.go +++ b/virtcontainers/sandboxlist_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 HyperHQ 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/shim.go b/virtcontainers/shim.go index cbbdcfd20..646ce7169 100644 --- a/virtcontainers/shim.go +++ b/virtcontainers/shim.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/shim/mock/cc-shim/shim.go b/virtcontainers/shim/mock/cc-shim/shim.go index fa65b4c96..8504c84ec 100644 --- a/virtcontainers/shim/mock/cc-shim/shim.go +++ b/virtcontainers/shim/mock/cc-shim/shim.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package main diff --git a/virtcontainers/shim/mock/kata-shim/shim.go b/virtcontainers/shim/mock/kata-shim/shim.go index 54fd32a4b..2bb33a67d 100644 --- a/virtcontainers/shim/mock/kata-shim/shim.go +++ b/virtcontainers/shim/mock/kata-shim/shim.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2018 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package main diff --git a/virtcontainers/shim_test.go b/virtcontainers/shim_test.go index c620675c3..57deb7d97 100644 --- a/virtcontainers/shim_test.go +++ b/virtcontainers/shim_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/spawner.go b/virtcontainers/spawner.go index 020fc9a3f..4d9de46df 100644 --- a/virtcontainers/spawner.go +++ b/virtcontainers/spawner.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/spawner_test.go b/virtcontainers/spawner_test.go index 0ba863581..2dadcd979 100644 --- a/virtcontainers/spawner_test.go +++ b/virtcontainers/spawner_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/syscall.go b/virtcontainers/syscall.go index fe483fcf2..020b0658d 100644 --- a/virtcontainers/syscall.go +++ b/virtcontainers/syscall.go @@ -1,18 +1,7 @@ -// // Copyright 2015 The rkt Authors // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/syscall_test.go b/virtcontainers/syscall_test.go index f6c0bfcdd..1eb8febdb 100644 --- a/virtcontainers/syscall_test.go +++ b/virtcontainers/syscall_test.go @@ -1,18 +1,7 @@ -// // Copyright 2015 The rkt Authors // Copyright (c) 2016 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/types.go b/virtcontainers/types.go index 3020c5f71..39a0244ea 100644 --- a/virtcontainers/types.go +++ b/virtcontainers/types.go @@ -1,16 +1,7 @@ // Copyright (c) 2017 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 virtcontainers diff --git a/virtcontainers/types_test.go b/virtcontainers/types_test.go index a3cac0205..ce70c3af6 100644 --- a/virtcontainers/types_test.go +++ b/virtcontainers/types_test.go @@ -1,16 +1,7 @@ // Copyright (c) 2017 Intel Corporation // -// 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 +// SPDX-License-Identifier: Apache-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, -// 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 virtcontainers diff --git a/virtcontainers/utils.go b/virtcontainers/utils.go index 69e63f586..078a97f3a 100644 --- a/virtcontainers/utils.go +++ b/virtcontainers/utils.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/utils/virtcontainers-setup.sh b/virtcontainers/utils/virtcontainers-setup.sh index f3f8be86e..d241ad8cd 100755 --- a/virtcontainers/utils/virtcontainers-setup.sh +++ b/virtcontainers/utils/virtcontainers-setup.sh @@ -1,18 +1,8 @@ #!/bin/bash # # Copyright (c) 2017,2018 Intel Corporation - -# 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. +# SPDX-License-Identifier: Apache-2.0 # set -e diff --git a/virtcontainers/utils_test.go b/virtcontainers/utils_test.go index dac0a1a46..ece0595b0 100644 --- a/virtcontainers/utils_test.go +++ b/virtcontainers/utils_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers diff --git a/virtcontainers/virtcontainers_test.go b/virtcontainers/virtcontainers_test.go index 7aead3244..838abc613 100644 --- a/virtcontainers/virtcontainers_test.go +++ b/virtcontainers/virtcontainers_test.go @@ -1,17 +1,6 @@ -// // Copyright (c) 2017 Intel Corporation // -// 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. +// SPDX-License-Identifier: Apache-2.0 // package virtcontainers