diff --git a/.github/README.md b/.github/README.md index 3d47ee9..17c8cbd 100644 --- a/.github/README.md +++ b/.github/README.md @@ -32,7 +32,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 b671d24..9ac0626 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 secret-vault: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 9818087..a94937a 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 build: binary-build diff --git a/cmd/secret-vault/config.go b/cmd/secret-vault/config.go index 5c5d5f1..2db45c8 100644 --- a/cmd/secret-vault/config.go +++ b/cmd/secret-vault/config.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/secret-vault/config_test.go b/cmd/secret-vault/config_test.go index 22d1ee9..a669727 100644 --- a/cmd/secret-vault/config_test.go +++ b/cmd/secret-vault/config_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/secret-vault/flag.go b/cmd/secret-vault/flag.go index ac27af7..58600e5 100644 --- a/cmd/secret-vault/flag.go +++ b/cmd/secret-vault/flag.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/secret-vault/main.go b/cmd/secret-vault/main.go index 50caf68..a0ed1e2 100644 --- a/cmd/secret-vault/main.go +++ b/cmd/secret-vault/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 @@ -22,7 +20,7 @@ func main() { app.Name = "secret-vault" app.HelpName = "secret-vault" app.Usage = "Vela Vault secret plugin for sourcing secrets into pipelines" - 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/secret-vault/plugin.go b/cmd/secret-vault/plugin.go index b5c6812..8217a2c 100644 --- a/cmd/secret-vault/plugin.go +++ b/cmd/secret-vault/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/secret-vault/plugin_test.go b/cmd/secret-vault/plugin_test.go index 04e4492..9000470 100644 --- a/cmd/secret-vault/plugin_test.go +++ b/cmd/secret-vault/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/secret-vault/read.go b/cmd/secret-vault/read.go index 7f6a292..c4e01bd 100644 --- a/cmd/secret-vault/read.go +++ b/cmd/secret-vault/read.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/secret-vault/read_test.go b/cmd/secret-vault/read_test.go index ceb87a7..89bbc11 100644 --- a/cmd/secret-vault/read_test.go +++ b/cmd/secret-vault/read_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/docker-compose.yml b/docker-compose.yml index 8726295..227e7ef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 version: '3' diff --git a/vault/flag.go b/vault/flag.go index d4e8616..32b33cd 100644 --- a/vault/flag.go +++ b/vault/flag.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 vault diff --git a/vault/read.go b/vault/read.go index 4f655ab..a59287b 100644 --- a/vault/read.go +++ b/vault/read.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 vault diff --git a/vault/read_test.go b/vault/read_test.go index ade823d..3ce46dd 100644 --- a/vault/read_test.go +++ b/vault/read_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 vault diff --git a/vault/vault.go b/vault/vault.go index fe86aa6..945b662 100644 --- a/vault/vault.go +++ b/vault/vault.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 vault diff --git a/vault/vault_test.go b/vault/vault_test.go index 479b6c2..b0112c1 100644 --- a/vault/vault_test.go +++ b/vault/vault_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 vault