Skip to content

licenses: updating licenses#69904

Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom
celiala:update-licenses
Oct 1, 2021
Merged

licenses: updating licenses#69904
craig[bot] merged 2 commits intocockroachdb:masterfrom
celiala:update-licenses

Conversation

@celiala
Copy link
Copy Markdown
Collaborator

@celiala celiala commented Sep 7, 2021

As part of Creating a release branch for release-21.2, this PR:

  • Adds the following new licenses:
    • BSL-1.0 (Boost Software License)
    • CC-BY-3.0
    • CC0-1.0
    • JSON
    • MPL-2.0
    • The Unlicense
  • Updates the BSL change date for 21.2 (we missed updating this last Spring; a separate PR will update this for master/22.1 after branch cut).

This PR is one of the tasks detailed in #70751, which tracks all the steps relevant to creating a release branch for ${vBRANCH_CUT} and preparing master for the ${vNEXT} major version.

Release justification: Non-production code change
Release note: None

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@celiala celiala requested review from bdarnell and jlinder September 7, 2021 23:53
Copy link
Copy Markdown
Collaborator

@jlinder jlinder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at http://unlicense.org, the license can be slightly modified to not include the last line ("For more information, please refer to https://unlicense.org"). If all the dependencies that use this license do not remove that line, then including just one file for it seems right.

Reviewed 6 of 6 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @bdarnell)

Copy link
Copy Markdown
Contributor

@bdarnell bdarnell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The presence of two BSL licenses is unfortunate. Let's rename the boost one to Boost-BSL.txt. (alternately, we could follow the SPDX convention and use BSL for boost and BUSL for business. But we refer to BSL.txt all over the place and I'm not eager to make that change right now).

updating BSL license for release branch 21.2

Release justification: Non-production code change
Release note: None
Release justification: Non-production code change
Release note: None
Copy link
Copy Markdown
Collaborator Author

@celiala celiala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TFTRs!

I'll plan to merge this as soon as tests pass. Afterwards, I'll also backport this to release-21.2, as approved in triage meeting.

Looking at http://unlicense.org, the license can be slightly modified to not include the last line ("For more information, please refer to https://unlicense.org"). If all the dependencies that use this license do not remove that line, then including just one file for it seems right.

Ack, done.

The presence of two BSL licenses is unfortunate. Let's rename the boost one to Boost-BSL.txt. (alternately, we could follow the SPDX convention and use BSL for boost and BUSL for business. But we refer to BSL.txt all over the place and I'm not eager to make that change right now).

Ack, done.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @jlinder)

@celiala
Copy link
Copy Markdown
Collaborator Author

celiala commented Oct 1, 2021

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Oct 1, 2021

Build succeeded:

@craig craig bot merged commit 3426e8d into cockroachdb:master Oct 1, 2021
@celiala celiala deleted the update-licenses branch April 5, 2022 04:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants