From 5eb54d38029e4664bda5f06c600db6c5678008e3 Mon Sep 17 00:00:00 2001 From: David May <49894298+wass3rw3rk@users.noreply.github.com> Date: Wed, 11 Oct 2023 09:11:20 -0500 Subject: [PATCH] chore(license): update source code headers + copyright year (#50) --- .github/README.md | 4 ++-- .golangci.yml | 4 +--- Dockerfile | 4 +--- LICENSE | 2 +- Makefile | 4 +--- cmd/vela-email/defaults.go | 4 +--- cmd/vela-email/loginauth.go | 4 +--- cmd/vela-email/main.go | 6 ++---- cmd/vela-email/plugin.go | 4 +--- cmd/vela-email/plugin_test.go | 4 +--- version/version.go | 4 +--- 11 files changed, 13 insertions(+), 31 deletions(-) diff --git a/.github/README.md b/.github/README.md index 107e46c..a9d388a 100644 --- a/.github/README.md +++ b/.github/README.md @@ -23,7 +23,7 @@ Please see our [support](SUPPORT.md) documentation for further instructions. ## Copyright and License ``` -Copyright (c) 2023 Target Brands, Inc. +Copyright 2022 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 914ce79..b668eb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ -# Copyright (c) 2023 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-email:certs . ## diff --git a/LICENSE b/LICENSE index 6b86f4a..f3c02b3 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work. same "printed page" as the copyright notice for easier identification within third-party archives. -Copyright (c) 2023 Target Brands, Inc. +Copyright 2022 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 98b40dd..f543f1b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,5 @@ -# Copyright (c) 2023 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-email/defaults.go b/cmd/vela-email/defaults.go index 3257de8..a29dfde 100644 --- a/cmd/vela-email/defaults.go +++ b/cmd/vela-email/defaults.go @@ -1,6 +1,4 @@ -// Copyright (c) 2023 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-email/loginauth.go b/cmd/vela-email/loginauth.go index 0d60b04..f741394 100644 --- a/cmd/vela-email/loginauth.go +++ b/cmd/vela-email/loginauth.go @@ -1,6 +1,4 @@ -// Copyright (c) 2023 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 // AUTH LOGIN is not built into go std lib smtp. // This helps with smtp hosts such as O365 and Exchange that uses AUTH LOGIN diff --git a/cmd/vela-email/main.go b/cmd/vela-email/main.go index a126384..3f2e31e 100644 --- a/cmd/vela-email/main.go +++ b/cmd/vela-email/main.go @@ -1,6 +1,4 @@ -// Copyright (c) 2023 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 @@ -36,7 +34,7 @@ func main() { Name: "vela-email", HelpName: "vela-email", Usage: "Vela Email plugin for sending Vela build information to a user's email.", - Copyright: "Copyright (c) 2023 Target Brands, Inc. All rights reserved.", + Copyright: "Copyright 2022 Target Brands, Inc. All rights reserved.", Authors: []*cli.Author{ { Name: "Vela Admins", diff --git a/cmd/vela-email/plugin.go b/cmd/vela-email/plugin.go index 5d94455..e70798c 100644 --- a/cmd/vela-email/plugin.go +++ b/cmd/vela-email/plugin.go @@ -1,6 +1,4 @@ -// Copyright (c) 2023 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-email/plugin_test.go b/cmd/vela-email/plugin_test.go index 9425be1..0a63bd2 100644 --- a/cmd/vela-email/plugin_test.go +++ b/cmd/vela-email/plugin_test.go @@ -1,6 +1,4 @@ -// Copyright (c) 2023 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 import ( diff --git a/version/version.go b/version/version.go index 8617408..192ceab 100644 --- a/version/version.go +++ b/version/version.go @@ -1,6 +1,4 @@ -// Copyright (c) 2023 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