Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

licenses: Add Elastic License 2.0 (Elasticv2) #28786

Merged
merged 3 commits into from
Nov 4, 2021

Conversation

marclop
Copy link
Contributor

@marclop marclop commented Nov 3, 2021

What does this PR do?

Adds the Elastic License 2.0 as Elasticv2 in the licenses package.
Updates the go-licenser to 0.4.0, since it adds support for the
Elasticv2 license.

Note that it does not modify the Beats license since that's out of
the scope of this PR.

Why is it important?

It unblocks elastic/apm-server#6105 and I believe may unblock some
work that's pending for Beats to switch to ELv2.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • Dev-tools.
  • Licenses package.

Related issues

Unblocks elastic/apm-server#6105

Adds the Elastic License 2.0 as `Elasticv2` in the `licenses` package.
Updates the `go-licenser` to `0.4.0`, since it adds support for the
`Elasticv2` license.

Signed-off-by: Marc Lopez Rubio <[email protected]>
@marclop marclop added enhancement v8.0.0 backport-v8.0.0 Automated backport with mergify labels Nov 3, 2021
@marclop marclop requested a review from a team as a code owner November 3, 2021 13:00
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 3, 2021
@marclop marclop added the Team:apm APM Server team issues/PRs label Nov 3, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 3, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 3, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-11-04T04:06:27.103+0000

  • Duration: 202 min 52 sec

  • Commit: a8f1c14

Test stats 🧪

Test Results
Failed 0
Passed 54119
Skipped 5355
Total 59474

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

@mergify
Copy link
Contributor

mergify bot commented Nov 3, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b f/add-elastic-license-2.0 upstream/f/add-elastic-license-2.0
git merge upstream/master
git push upstream f/add-elastic-license-2.0

@marclop marclop requested a review from a team November 4, 2021 07:43
@marclop marclop merged commit 8556093 into master Nov 4, 2021
@marclop marclop deleted the f/add-elastic-license-2.0 branch November 4, 2021 08:54
mergify bot pushed a commit that referenced this pull request Nov 4, 2021
Adds the Elastic License 2.0 as `Elasticv2` in the `licenses` package.
Updates the `go-licenser` to `0.4.0`, since it adds support for the
`Elasticv2` license.

Signed-off-by: Marc Lopez Rubio <[email protected]>
(cherry picked from commit 8556093)

# Conflicts:
#	go.mod
#	go.sum
marclop pushed a commit that referenced this pull request Nov 8, 2021
#28808)

Adds the Elastic License 2.0 as `Elasticv2` in the `licenses` package.
Updates the `go-licenser` to `0.4.0`, since it adds support for the
`Elasticv2` license.

Signed-off-by: Marc Lopez Rubio <[email protected]>
(cherry picked from commit 8556093)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.0.0 Automated backport with mergify enhancement Team:apm APM Server team issues/PRs v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants