From d6c3ec864be6bbbfd68758a68a909701747b7b54 Mon Sep 17 00:00:00 2001 From: Graham whaley Date: Wed, 18 Apr 2018 13:35:56 +0100 Subject: [PATCH] license: SPDX: update all vc files to use SPDX style When imported, the vc files carried in the 'full style' apache license text, but the standard for kata is to use SPDX style. Update the relevant files to SPDX. Fixes: #227 Signed-off-by: Graham whaley --- virtcontainers/agent.go | 13 +------------ virtcontainers/agent_test.go | 13 +------------ virtcontainers/api.go | 13 +------------ virtcontainers/api_test.go | 13 +------------ virtcontainers/asset.go | 13 +------------ virtcontainers/asset_test.go | 13 +------------ virtcontainers/bridge.go | 13 +------------ virtcontainers/bridge_test.go | 13 +------------ virtcontainers/capabilities.go | 13 +------------ virtcontainers/capabilities_test.go | 13 +------------ virtcontainers/cc_proxy.go | 13 +------------ virtcontainers/cc_proxy_test.go | 12 +----------- virtcontainers/cc_shim.go | 13 +------------ virtcontainers/cc_shim_test.go | 13 +------------ virtcontainers/cni.go | 13 +------------ virtcontainers/cnm.go | 13 +------------ virtcontainers/container.go | 13 +------------ virtcontainers/container_test.go | 13 +------------ virtcontainers/device.go | 13 +------------ virtcontainers/device_test.go | 13 +------------ virtcontainers/doc.go | 13 +------------ virtcontainers/errors.go | 13 +------------ virtcontainers/example_pod_run_test.go | 13 +------------ virtcontainers/filesystem.go | 13 +------------ virtcontainers/filesystem_test.go | 13 +------------ virtcontainers/hack/virtc/main.go | 13 +------------ virtcontainers/hook.go | 13 +------------ virtcontainers/hook/mock/hook.go | 13 +------------ virtcontainers/hook_test.go | 13 +------------ virtcontainers/hyperstart_agent.go | 13 +------------ virtcontainers/hyperstart_agent_test.go | 13 +------------ virtcontainers/hypervisor.go | 13 +------------ virtcontainers/hypervisor_test.go | 13 +------------ virtcontainers/implementation.go | 11 +---------- virtcontainers/interfaces.go | 11 +---------- virtcontainers/kata_agent.go | 13 +------------ virtcontainers/kata_agent_test.go | 13 +------------ virtcontainers/kata_builtin_proxy.go | 13 +------------ virtcontainers/kata_builtin_shim.go | 13 +------------ virtcontainers/kata_proxy.go | 13 +------------ virtcontainers/kata_shim.go | 13 +------------ virtcontainers/kata_shim_test.go | 13 +------------ virtcontainers/mock_hypervisor.go | 13 +------------ virtcontainers/mock_hypervisor_test.go | 13 +------------ virtcontainers/mount.go | 13 +------------ virtcontainers/mount_test.go | 13 +------------ virtcontainers/network.go | 13 +------------ virtcontainers/network_test.go | 13 +------------ virtcontainers/no_proxy.go | 13 +------------ virtcontainers/no_proxy_test.go | 13 +------------ virtcontainers/noop_agent.go | 13 +------------ virtcontainers/noop_agent_test.go | 12 +----------- virtcontainers/noop_network.go | 13 +------------ virtcontainers/noop_proxy.go | 13 +------------ virtcontainers/noop_shim.go | 13 +------------ virtcontainers/noop_shim_test.go | 13 +------------ virtcontainers/nsenter.go | 13 +------------ virtcontainers/nsenter_test.go | 13 +------------ virtcontainers/pkg/annotations/annotations.go | 13 +------------ .../pkg/annotations/dockershim/annotations.go | 13 +------------ virtcontainers/pkg/cni/cni.go | 13 +------------ virtcontainers/pkg/cni/cni_test.go | 13 +------------ virtcontainers/pkg/hyperstart/hyperstart.go | 13 +------------ virtcontainers/pkg/hyperstart/hyperstart_test.go | 13 +------------ virtcontainers/pkg/hyperstart/mock/hyperstart.go | 11 +---------- virtcontainers/pkg/hyperstart/mock/misc.go | 11 +---------- virtcontainers/pkg/hyperstart/mock/rand.go | 11 +---------- virtcontainers/pkg/hyperstart/multicast.go | 13 +------------ virtcontainers/pkg/hyperstart/types.go | 13 +------------ virtcontainers/pkg/mock/cc_proxy_mock.go | 11 +---------- virtcontainers/pkg/mock/mock.go | 13 +------------ virtcontainers/pkg/nsenter/nsenter.go | 13 +------------ virtcontainers/pkg/nsenter/nsenter_test.go | 13 +------------ virtcontainers/pkg/oci/utils.go | 11 +---------- virtcontainers/pkg/oci/utils_test.go | 13 +------------ virtcontainers/pkg/oci/utils_test_config.go | 13 +------------ virtcontainers/pkg/uuid/uuid.go | 13 +------------ virtcontainers/pkg/uuid/uuid_test.go | 13 +------------ virtcontainers/pkg/vcmock/container.go | 11 +---------- virtcontainers/pkg/vcmock/mock.go | 11 +---------- virtcontainers/pkg/vcmock/mock_test.go | 11 +---------- virtcontainers/pkg/vcmock/sandbox.go | 11 +---------- virtcontainers/pkg/vcmock/types.go | 11 +---------- virtcontainers/pkg/vcmock/utils.go | 11 +---------- virtcontainers/proxy.go | 13 +------------ virtcontainers/proxy_test.go | 13 +------------ virtcontainers/qemu.go | 13 +------------ virtcontainers/qemu_amd64.go | 13 +------------ virtcontainers/qemu_amd64_test.go | 13 +------------ virtcontainers/qemu_arch_base.go | 13 +------------ virtcontainers/qemu_arch_base_test.go | 13 +------------ virtcontainers/qemu_arm64.go | 13 +------------ virtcontainers/qemu_test.go | 13 +------------ virtcontainers/sandbox.go | 13 +------------ virtcontainers/sandbox_test.go | 13 +------------ virtcontainers/sandboxlist.go | 13 +------------ virtcontainers/sandboxlist_test.go | 13 +------------ virtcontainers/shim.go | 13 +------------ virtcontainers/shim/mock/cc-shim/shim.go | 13 +------------ virtcontainers/shim/mock/kata-shim/shim.go | 13 +------------ virtcontainers/shim_test.go | 13 +------------ virtcontainers/spawner.go | 13 +------------ virtcontainers/spawner_test.go | 13 +------------ virtcontainers/syscall.go | 13 +------------ virtcontainers/syscall_test.go | 13 +------------ virtcontainers/types.go | 11 +---------- virtcontainers/types_test.go | 11 +---------- virtcontainers/utils.go | 13 +------------ virtcontainers/utils/virtcontainers-setup.sh | 12 +----------- virtcontainers/utils_test.go | 13 +------------ virtcontainers/virtcontainers_test.go | 13 +------------ 111 files changed, 111 insertions(+), 1299 deletions(-) diff --git a/virtcontainers/agent.go b/virtcontainers/agent.go index 7a42c0e340..c273c46db3 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 b65e06fdc2..108d69f938 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 0a84e361a7..3dd8731e70 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 788a74cd90..f6eaf5c20a 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 044eeb80f5..8294fc5f23 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 21a901c491..dd414fec2d 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 dfddd3eee3..7c29222658 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 74b8fcc339..570d28f4e1 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 9a817cdd0d..8760c99691 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 0b4b9723dd..91bde2fe55 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 bb1f9eafad..f2df0ca191 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 164fad5bed..ba295178a2 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 d0cc4cace3..c1c31252dc 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 3d1c01ed04..82e25c98c0 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 fba20e494e..2704521f74 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 83d256c98e..85a80332bb 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 0593bac439..38dfab88a6 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 9bffb429c4..8aa9580010 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 123e26259d..b47d59bcfa 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 6317f3dfae..82783e35f9 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 75eb601f93..2fad5d638a 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 c8bd59dea6..dfd633ac03 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 12cc733782..7ac0658cff 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 d474ecf3ea..8a4f19bac8 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 5a3f19fd1b..edc96109e8 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 e483b0a6fb..f4aa95a075 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 66c8674064..f240c05f89 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 7df8d97250..e5906aea5a 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 8b8d947a76..7bc5578f9f 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 cd76aef18d..53481d0b9d 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 b669d8a2db..d2a1ea88bb 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 ef387f9379..45990535d0 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 a14892bc0c..5a9957eda5 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 5b6d90bcf3..7d7c981d98 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 e32d4822e3..8618b8b339 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 d950758dac..f9c3dab4a3 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 568d7b9d62..aa9f4f4585 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 d84f7cc3aa..95f6e092ae 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 0c41d633aa..5879e5502d 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 fbdd92fff4..a4c488e00f 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 9f1693e124..d8f17b0810 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 4ae1057f3e..6dd3bb2897 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 667d66710a..15bc8e9b55 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 48d6b28e4d..746b472fa3 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 e348d1b04b..da512779ad 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 89ee65dd1d..d907b11252 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 281f47de21..26df77dbd6 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 1cb04b8359..b204b862a9 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 2f4fff2843..69dec3ef90 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 455c4f6636..8e3f04b05b 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 7071d375bb..eff024cc89 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 f0a5603f30..f4e193ee2f 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 7caff5d4fc..67c98fb108 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 f1bb83b19a..84f36c5e2b 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 e7d34c1631..082c43e5a4 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 f34e800c69..991640cddb 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 9c9f648ea2..d89b55ac92 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 6061dc734c..e49880a04a 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 7a99b83baf..5fc601baeb 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 ce2d48cf12..e09275d36d 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 e180a66a06..c98ac557e8 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 cf2072dddf..609179aec0 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 57f7c27303..36474566ef 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 a9c2103377..56c155f705 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 09177fe7e3..8714849a1c 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 26ef34de5a..1c1e16a6bd 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 29193b115d..1f04de41b3 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 cedb86eafb..c416ff0012 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 5c2ccc4374..68c28ea611 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 743e3ffa8a..052612ade8 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 c78b701686..69c66aa9e4 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 ffcfbfb696..20824c13ef 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 220d9c63d6..8d277520c6 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 fe53f73bcd..c39c4a9ff6 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 7c9f7df3bd..80f051847c 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 a7acb18ca5..3dd2cd31cf 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 c7df53a42d..6c4c651a8f 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 1d44b75fc9..0d39b92def 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 8da24bc032..d93c271811 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 0a98141955..938ec44a69 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 be3d3759e8..226dc9d8ed 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 3c7ec68b82..873b66a5e4 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 37df12a7db..f94cce5c70 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 c41068a7a2..d2e5433f37 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 35a7665ba2..eeb58ee417 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 768dfa45a9..8af297737d 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 3fd1cbe068..32167b7c4f 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 24650c8662..1a73f230a1 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 89898df4c0..751047bcac 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 81fcf8a8eb..71189574e1 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 9774d2a4b4..6dcc0723b7 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 e38916da6a..2b80440b5f 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 3670f1c623..367c724f5e 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 01eb69a59d..4195db6741 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 be36b40ac8..ab12b58390 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 d6b73c5f2d..d67b4d21fd 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 6cfbd733b1..c320fb3eec 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 cbbdcfd208..646ce71699 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 fa65b4c96a..8504c84ecd 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 54fd32a4bb..2bb33a67d5 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 c620675c36..57deb7d970 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 020fc9a3f1..4d9de46dfb 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 0ba863581e..2dadcd9792 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 fe483fcf2c..020b0658d4 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 f6c0bfcdd9..1eb8febdb0 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 3020c5f711..39a0244ea6 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 a3cac02054..ce70c3af6c 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 69e63f5869..078a97f3aa 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 f3f8be86ee..d241ad8cd3 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 dac0a1a465..ece0595b08 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 7aead32447..838abc6138 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