From e757a592c12780776a83c822c37a22be9a95c33d Mon Sep 17 00:00:00 2001 From: Graham whaley Date: Tue, 17 Apr 2018 17:30:44 +0100 Subject: [PATCH] SPDX: update cli and arch files to use SPDX Many cli and arch files were using the 'older style' fairly full Apache license text. The project standard is the shorter SPDX style. Convert them over. Fixes: #225 Signed-off-by: Graham whaley --- arch/amd64-options.mk | 11 +---------- arch/arm64-options.mk | 11 +---------- cli/config.go | 11 +---------- cli/config_test.go | 11 +---------- cli/console.go | 11 +---------- cli/console_test.go | 11 +---------- cli/create.go | 11 +---------- cli/create_test.go | 11 +---------- cli/delete.go | 11 +---------- cli/delete_test.go | 11 +---------- cli/exec.go | 11 +---------- cli/exec_test.go | 11 +---------- cli/exit.go | 11 +---------- cli/exit_test.go | 11 +---------- cli/kata-check.go | 11 +---------- cli/kata-check_amd64.go | 11 +---------- cli/kata-check_amd64_test.go | 11 +---------- cli/kata-check_test.go | 11 +---------- cli/kata-env.go | 11 +---------- cli/kata-env_test.go | 11 +---------- cli/kill.go | 11 +---------- cli/kill_test.go | 11 +---------- cli/list.go | 11 +---------- cli/list_test.go | 11 +---------- cli/logger.go | 11 +---------- cli/logger_test.go | 11 +---------- cli/main.go | 11 +---------- cli/main_test.go | 13 +------------ cli/oci.go | 11 +---------- cli/oci_test.go | 11 +---------- cli/pause.go | 11 +---------- cli/pause_test.go | 11 +---------- cli/ps.go | 11 +---------- cli/ps_test.go | 11 +---------- cli/run.go | 11 +---------- cli/run_test.go | 11 +---------- cli/start.go | 11 +---------- cli/start_test.go | 11 +---------- cli/state.go | 11 +---------- cli/state_test.go | 11 +---------- cli/utils.go | 11 +---------- cli/utils_test.go | 11 +---------- cli/version.go | 11 +---------- cli/version_test.go | 13 +------------ 44 files changed, 44 insertions(+), 444 deletions(-) diff --git a/arch/amd64-options.mk b/arch/amd64-options.mk index b30fb161b..56126f248 100644 --- a/arch/amd64-options.mk +++ b/arch/amd64-options.mk @@ -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. # Intel x86-64 settings diff --git a/arch/arm64-options.mk b/arch/arm64-options.mk index 6df4504f8..51fbca234 100644 --- a/arch/arm64-options.mk +++ b/arch/arm64-options.mk @@ -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. # ARM 64 settings diff --git a/cli/config.go b/cli/config.go index 98629e152..c36e5f357 100644 --- a/cli/config.go +++ b/cli/config.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 main diff --git a/cli/config_test.go b/cli/config_test.go index 6b3f7c581..1b974dde9 100644 --- a/cli/config_test.go +++ b/cli/config_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 main diff --git a/cli/console.go b/cli/console.go index d9a186331..eb1e4758a 100644 --- a/cli/console.go +++ b/cli/console.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016 Docker, Inc. // 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 main diff --git a/cli/console_test.go b/cli/console_test.go index cedea3a98..951c9c24c 100644 --- a/cli/console_test.go +++ b/cli/console_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 main diff --git a/cli/create.go b/cli/create.go index 0c16b27c2..11a729fdd 100644 --- a/cli/create.go +++ b/cli/create.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016 Docker, Inc. // 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 main diff --git a/cli/create_test.go b/cli/create_test.go index cda229334..76a10cd7f 100644 --- a/cli/create_test.go +++ b/cli/create_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 main diff --git a/cli/delete.go b/cli/delete.go index 451f4a30e..b775b6a11 100644 --- a/cli/delete.go +++ b/cli/delete.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016 Docker, Inc. // 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 main diff --git a/cli/delete_test.go b/cli/delete_test.go index 00ecf98de..89c571546 100644 --- a/cli/delete_test.go +++ b/cli/delete_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 main diff --git a/cli/exec.go b/cli/exec.go index 24ea436de..b1bcc4599 100644 --- a/cli/exec.go +++ b/cli/exec.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016 Docker, Inc. // 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 main diff --git a/cli/exec_test.go b/cli/exec_test.go index b20f93228..d0d13042e 100644 --- a/cli/exec_test.go +++ b/cli/exec_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 main diff --git a/cli/exit.go b/cli/exit.go index 76c006751..4a95ebe0d 100644 --- a/cli/exit.go +++ b/cli/exit.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 main diff --git a/cli/exit_test.go b/cli/exit_test.go index 46e7385b4..59913762b 100644 --- a/cli/exit_test.go +++ b/cli/exit_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 main diff --git a/cli/kata-check.go b/cli/kata-check.go index 0ffd38e7f..3ecb67cfc 100644 --- a/cli/kata-check.go +++ b/cli/kata-check.go @@ -1,16 +1,7 @@ // 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 +// 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. // Note: To add a new architecture, implement all identifiers beginning "arch". diff --git a/cli/kata-check_amd64.go b/cli/kata-check_amd64.go index 5d5a11708..f65eec89b 100644 --- a/cli/kata-check_amd64.go +++ b/cli/kata-check_amd64.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 main diff --git a/cli/kata-check_amd64_test.go b/cli/kata-check_amd64_test.go index 5aa073152..8aed40ecf 100644 --- a/cli/kata-check_amd64_test.go +++ b/cli/kata-check_amd64_test.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 main diff --git a/cli/kata-check_test.go b/cli/kata-check_test.go index f8994d02b..4a68ac605 100644 --- a/cli/kata-check_test.go +++ b/cli/kata-check_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 main diff --git a/cli/kata-env.go b/cli/kata-env.go index 73495f847..bcbd53d7d 100644 --- a/cli/kata-env.go +++ b/cli/kata-env.go @@ -1,16 +1,7 @@ // 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 +// 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 main diff --git a/cli/kata-env_test.go b/cli/kata-env_test.go index ee21c0e3d..07d74c326 100644 --- a/cli/kata-env_test.go +++ b/cli/kata-env_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 main diff --git a/cli/kill.go b/cli/kill.go index 33c4ec048..52d274436 100644 --- a/cli/kill.go +++ b/cli/kill.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016 Docker, Inc. // 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 main diff --git a/cli/kill_test.go b/cli/kill_test.go index 0305ae370..5796c04fa 100644 --- a/cli/kill_test.go +++ b/cli/kill_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 main diff --git a/cli/list.go b/cli/list.go index a3f928b60..de1770d89 100644 --- a/cli/list.go +++ b/cli/list.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016,2017 Docker, Inc. // 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 main diff --git a/cli/list_test.go b/cli/list_test.go index 49ea4ca90..30a3da300 100644 --- a/cli/list_test.go +++ b/cli/list_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 main diff --git a/cli/logger.go b/cli/logger.go index 076330699..a8ee2ae48 100644 --- a/cli/logger.go +++ b/cli/logger.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 main diff --git a/cli/logger_test.go b/cli/logger_test.go index 495f2a096..5b39d2f94 100644 --- a/cli/logger_test.go +++ b/cli/logger_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 main diff --git a/cli/main.go b/cli/main.go index 5dbfdb3e1..7d32cead2 100644 --- a/cli/main.go +++ b/cli/main.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016 Docker, Inc. // 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 +// 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 main diff --git a/cli/main_test.go b/cli/main_test.go index f84b921ca..39ee3eb62 100644 --- a/cli/main_test.go +++ b/cli/main_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 main diff --git a/cli/oci.go b/cli/oci.go index 41403d262..465bf0d52 100644 --- a/cli/oci.go +++ b/cli/oci.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 main diff --git a/cli/oci_test.go b/cli/oci_test.go index d30d46cd5..19f6a5845 100644 --- a/cli/oci_test.go +++ b/cli/oci_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 main diff --git a/cli/pause.go b/cli/pause.go index 912c43706..2994b0a05 100644 --- a/cli/pause.go +++ b/cli/pause.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016 Docker, Inc. // 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 main diff --git a/cli/pause_test.go b/cli/pause_test.go index 78fc3381a..adff29999 100644 --- a/cli/pause_test.go +++ b/cli/pause_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 main diff --git a/cli/ps.go b/cli/ps.go index 0e87a9439..73e18005a 100644 --- a/cli/ps.go +++ b/cli/ps.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016 Docker, Inc. // 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 main diff --git a/cli/ps_test.go b/cli/ps_test.go index c9aad8245..9aeb1a5b8 100644 --- a/cli/ps_test.go +++ b/cli/ps_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 main diff --git a/cli/run.go b/cli/run.go index 294002aa1..86f4779f2 100644 --- a/cli/run.go +++ b/cli/run.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016 Docker, Inc. // 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 main diff --git a/cli/run_test.go b/cli/run_test.go index 5c43540e2..ff08fddaa 100644 --- a/cli/run_test.go +++ b/cli/run_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 main diff --git a/cli/start.go b/cli/start.go index afa7ecf9a..a96e9c1a0 100644 --- a/cli/start.go +++ b/cli/start.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016 Docker, Inc. // 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 main diff --git a/cli/start_test.go b/cli/start_test.go index 0016c10ac..911b63a3c 100644 --- a/cli/start_test.go +++ b/cli/start_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 main diff --git a/cli/state.go b/cli/state.go index e47dfd68a..c264616dc 100644 --- a/cli/state.go +++ b/cli/state.go @@ -1,17 +1,8 @@ // Copyright (c) 2014,2015,2016 Docker, Inc. // 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 main diff --git a/cli/state_test.go b/cli/state_test.go index 8e066aff0..ac37b0273 100644 --- a/cli/state_test.go +++ b/cli/state_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 main diff --git a/cli/utils.go b/cli/utils.go index 766624a73..6c4dd9b9e 100644 --- a/cli/utils.go +++ b/cli/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 main diff --git a/cli/utils_test.go b/cli/utils_test.go index cee4eba2d..ed709fbab 100644 --- a/cli/utils_test.go +++ b/cli/utils_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 main diff --git a/cli/version.go b/cli/version.go index 0ccd600bc..d743ef671 100644 --- a/cli/version.go +++ b/cli/version.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 main diff --git a/cli/version_test.go b/cli/version_test.go index edcc37c94..5c41f769e 100644 --- a/cli/version_test.go +++ b/cli/version_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 main