Correctly package with the ELv2 license (#5464)

* Remove ELastic License, use Elastic License 2.0. * Switch license headers to ELv2. * Update license in new files. * Add changelog. * Fix changelog. * Change licenser to use Elv2 * Fix checked license header * Switch changelog to enhancement.
elastic · Sep 9, 2024 · 8c43ad3 · 8c43ad3
1 parent a11954b
commit 8c43ad3
Show file tree

Hide file tree

Showing 793 changed files with 1,607 additions and 1,851 deletions.
diff --git a/...log/fragments/1725655844-Include-correct-ELv2-license-file-in-elastic-agent-packages.yaml b/...log/fragments/1725655844-Include-correct-ELv2-license-file-in-elastic-agent-packages.yaml
@@ -0,0 +1,17 @@
+kind: enhancement
+
+# Change summary; a 80ish characters long description of the change.
+summary: Include the correct Elastic License 2.0 file in build artifacts and packages.
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: "elastic-agent"
+
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+pr: https://github.com/elastic/elastic-agent/pull/5464
+
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+#issue: https://github.com/owner/repo/1234
diff --git a/dev-tools/cmd/buildfleetcfg/buildfleetcfg.go b/dev-tools/cmd/buildfleetcfg/buildfleetcfg.go
diff --git a/dev-tools/cmd/buildpgp/build_pgp.go b/dev-tools/cmd/buildpgp/build_pgp.go
diff --git a/dev-tools/licenses/ELASTIC-LICENSE-header.txt b/dev-tools/licenses/ELASTIC-LICENSE-header.txt
diff --git a/dev-tools/licenses/ELASTIC-LICENSE.txt b/dev-tools/licenses/ELASTIC-LICENSE.txt
diff --git a/dev-tools/licenses/license.go b/dev-tools/licenses/license.go
@@ -1,6 +1,6 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-// or more contributor license agreements. Licensed under the Elastic License;
-// you may not use this file except in compliance with the Elastic License.
+// or more contributor license agreements. Licensed under the Elastic License 2.0;
+// you may not use this file except in compliance with the Elastic License 2.0.
 
 package licenses
 

diff --git a/dev-tools/licenses/license_generate.go b/dev-tools/licenses/license_generate.go
diff --git a/dev-tools/licenses/license_header.go b/dev-tools/licenses/license_header.go
diff --git a/dev-tools/mage/build.go b/dev-tools/mage/build.go
@@ -1,6 +1,6 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-// or more contributor license agreements. Licensed under the Elastic License;
-// you may not use this file except in compliance with the Elastic License.
+// or more contributor license agreements. Licensed under the Elastic License 2.0;
+// you may not use this file except in compliance with the Elastic License 2.0.
 
 package mage