diff --git a/.github/README.md b/.github/README.md index 914863c..f6c3f0c 100644 --- a/.github/README.md +++ b/.github/README.md @@ -28,7 +28,7 @@ Please see our [support](SUPPORT.md) documentation for further instructions. ## Copyright and License ``` -Copyright (c) 2022 Target Brands, Inc. +Copyright 2020 Target Brands, Inc. ``` -[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) +[Apache License, Version 2.0](../LICENSE) diff --git a/.golangci.yml b/.golangci.yml index 97b6d15..44382f6 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -35,9 +35,7 @@ linters-settings: # https://github.com/denis-tingaikin/go-header goheader: template: |- - Copyright (c) {{ YEAR }} Target Brands, Inc. All rights reserved. - - Use of this source code is governed by the LICENSE file in this repository. + SPDX-License-Identifier: Apache-2.0 # https://github.com/client9/misspell misspell: diff --git a/Dockerfile b/Dockerfile index 260da90..d8594a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,4 @@ -# Copyright (c) 2022 Target Brands, Inc. All rights reserved. -# -# Use of this source code is governed by the LICENSE file in this repository. +# SPDX-License-Identifier: Apache-2.0 ######################################################################### ## docker build --no-cache --target certs -t vela-docker:certs . ## diff --git a/LICENSE b/LICENSE index 3abdb03..2f0c342 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright (c) 2022 Target Brands, Inc. + Copyright 2020 Target Brands, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/Makefile b/Makefile index 36b2232..eecb23b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,4 @@ -# Copyright (c) 2022 Target Brands, Inc. All rights reserved. -# -# Use of this source code is governed by the LICENSE file in this repository. +# SPDX-License-Identifier: Apache-2.0 # capture the current date we build the application from BUILD_DATE = $(shell date +%Y-%m-%dT%H:%M:%SZ) diff --git a/cmd/vela-docker/build.go b/cmd/vela-docker/build.go index fdd8b65..52c7737 100644 --- a/cmd/vela-docker/build.go +++ b/cmd/vela-docker/build.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/cmd/vela-docker/build_test.go b/cmd/vela-docker/build_test.go index 4b8404c..d496e54 100644 --- a/cmd/vela-docker/build_test.go +++ b/cmd/vela-docker/build_test.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/cmd/vela-docker/command.go b/cmd/vela-docker/command.go index 6c39683..4b14eea 100644 --- a/cmd/vela-docker/command.go +++ b/cmd/vela-docker/command.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/cmd/vela-docker/command_test.go b/cmd/vela-docker/command_test.go index f89ad41..fbfbbc5 100644 --- a/cmd/vela-docker/command_test.go +++ b/cmd/vela-docker/command_test.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/cmd/vela-docker/daemon.go b/cmd/vela-docker/daemon.go index 11c9a6e..3fa26f8 100644 --- a/cmd/vela-docker/daemon.go +++ b/cmd/vela-docker/daemon.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/cmd/vela-docker/daemon_test.go b/cmd/vela-docker/daemon_test.go index f0ec08f..48c7a88 100644 --- a/cmd/vela-docker/daemon_test.go +++ b/cmd/vela-docker/daemon_test.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/cmd/vela-docker/main.go b/cmd/vela-docker/main.go index cd15c2d..65046f6 100644 --- a/cmd/vela-docker/main.go +++ b/cmd/vela-docker/main.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main @@ -40,7 +38,7 @@ func main() { app.Name = "vela-docker" app.HelpName = "vela-docker" app.Usage = "Vela Docker plugin for building and publishing images" - app.Copyright = "Copyright (c) 2022 Target Brands, Inc. All rights reserved." + app.Copyright = "Copyright 2020 Target Brands, Inc. All rights reserved." app.Authors = []*cli.Author{ { Name: "Vela Admins", diff --git a/cmd/vela-docker/plugin.go b/cmd/vela-docker/plugin.go index 5cc1013..368781d 100644 --- a/cmd/vela-docker/plugin.go +++ b/cmd/vela-docker/plugin.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/cmd/vela-docker/plugin_test.go b/cmd/vela-docker/plugin_test.go index 26ca7a4..d1b0c63 100644 --- a/cmd/vela-docker/plugin_test.go +++ b/cmd/vela-docker/plugin_test.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/cmd/vela-docker/push.go b/cmd/vela-docker/push.go index 1245d97..0cf3957 100644 --- a/cmd/vela-docker/push.go +++ b/cmd/vela-docker/push.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/cmd/vela-docker/push_test.go b/cmd/vela-docker/push_test.go index 7b945e6..15b41ef 100644 --- a/cmd/vela-docker/push_test.go +++ b/cmd/vela-docker/push_test.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/cmd/vela-docker/registry.go b/cmd/vela-docker/registry.go index 2bdce78..282bb19 100644 --- a/cmd/vela-docker/registry.go +++ b/cmd/vela-docker/registry.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/cmd/vela-docker/registry_test.go b/cmd/vela-docker/registry_test.go index a333242..1587d00 100644 --- a/cmd/vela-docker/registry_test.go +++ b/cmd/vela-docker/registry_test.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/version/version.go b/version/version.go index 40b66f9..3777217 100644 --- a/version/version.go +++ b/version/version.go @@ -1,6 +1,4 @@ -// Copyright (c) 2022 Target Brands, Inc. All rights reserved. -// -// Use of this source code is governed by the LICENSE file in this repository. +// SPDX-License-Identifier: Apache-2.0 package version