Merge pull request #374 from crossplane/backport-373-to-release-1.2

[Backport release-1.2] Move license statements to separate files (for tmpl files) to prevent license statement duplication
crossplane · Mar 14, 2024 · 8b328b5 · 8b328b5
2 parents f472f48 + 3e39bc3
commit 8b328b5
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 32 deletions.
diff --git a/pkg/pipeline/templates/controller.go.tmpl b/pkg/pipeline/templates/controller.go.tmpl
@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2023 The Crossplane Authors <https://crossplane.io>
-//
-// SPDX-License-Identifier: Apache-2.0
-
 {{ .Header }}
 
 {{ .GenStatement }}

diff --git a/pkg/pipeline/templates/controller.go.tmpl.license b/pkg/pipeline/templates/controller.go.tmpl.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/pkg/pipeline/templates/conversion_hub.go.tmpl b/pkg/pipeline/templates/conversion_hub.go.tmpl
@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2023 The Crossplane Authors <https://crossplane.io>
-//
-// SPDX-License-Identifier: Apache-2.0
-
 {{ .Header }}
 
 {{ .GenStatement }}

diff --git a/pkg/pipeline/templates/conversion_hub.go.tmpl.license b/pkg/pipeline/templates/conversion_hub.go.tmpl.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/pkg/pipeline/templates/conversion_spoke.go.tmpl b/pkg/pipeline/templates/conversion_spoke.go.tmpl
@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2023 The Crossplane Authors <https://crossplane.io>
-//
-// SPDX-License-Identifier: Apache-2.0
-
 {{ .Header }}
 
 {{ .GenStatement }}

diff --git a/pkg/pipeline/templates/conversion_spoke.go.tmpl.license b/pkg/pipeline/templates/conversion_spoke.go.tmpl.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/pkg/pipeline/templates/crd_types.go.tmpl b/pkg/pipeline/templates/crd_types.go.tmpl
@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2023 The Crossplane Authors <https://crossplane.io>
-//
-// SPDX-License-Identifier: Apache-2.0
-
 {{ .Header }}
 
 {{ .GenStatement }}

diff --git a/pkg/pipeline/templates/crd_types.go.tmpl.license b/pkg/pipeline/templates/crd_types.go.tmpl.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/pkg/pipeline/templates/groupversion_info.go.tmpl b/pkg/pipeline/templates/groupversion_info.go.tmpl
@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2023 The Crossplane Authors <https://crossplane.io>
-//
-// SPDX-License-Identifier: Apache-2.0
-
 {{ .Header }}
 
 {{ .GenStatement }}

diff --git a/pkg/pipeline/templates/groupversion_info.go.tmpl.license b/pkg/pipeline/templates/groupversion_info.go.tmpl.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/pkg/pipeline/templates/register.go.tmpl b/pkg/pipeline/templates/register.go.tmpl
@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2023 The Crossplane Authors <https://crossplane.io>
-//
-// SPDX-License-Identifier: Apache-2.0
-
 {{ .Header }}
 
 {{ .GenStatement }}

diff --git a/pkg/pipeline/templates/register.go.tmpl.license b/pkg/pipeline/templates/register.go.tmpl.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/pkg/pipeline/templates/setup.go.tmpl b/pkg/pipeline/templates/setup.go.tmpl
@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2023 The Crossplane Authors <https://crossplane.io>
-//
-// SPDX-License-Identifier: Apache-2.0
-
 package controller
 
 import (

diff --git a/pkg/pipeline/templates/setup.go.tmpl.license b/pkg/pipeline/templates/setup.go.tmpl.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/pkg/pipeline/templates/terraformed.go.tmpl b/pkg/pipeline/templates/terraformed.go.tmpl
@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2023 The Crossplane Authors <https://crossplane.io>
-//
-// SPDX-License-Identifier: Apache-2.0
-
 {{ .Header }}
 
 {{ .GenStatement }}

diff --git a/pkg/pipeline/templates/terraformed.go.tmpl.license b/pkg/pipeline/templates/terraformed.go.tmpl.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>
+
+SPDX-License-Identifier: Apache-2.0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>

		SPDX-License-Identifier: Apache-2.0