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

Apply CC-BY-SA 4.0 license to the FINOS InnerSource Special Interest Group InnerSource repository #39

Merged
merged 15 commits into from
Oct 25, 2021

Conversation

mcleo-d
Copy link
Member

@mcleo-d mcleo-d commented Oct 25, 2021

Description

This pull request adds and updates the following files to apply the CC-BY-SA 4.0 license to the FINOS InnerSource Special Interest Group InnerSource repository.

Note : The initial PR review should me made by @copiesofcopies before merging into the InnerSource repo.

  1. Add file LICENSE-CC-BY-SA-4.0 with LICENSE-CC-BY-SA-4.0 license text.
  2. Update LICENCE.spdx to reflect licenses that have been applied to the InnerSource repository.
  3. Update README.md to reflect LICENSE-CC-BY-SA-4.0 and APACHE 2.0 licenses.
  4. Remove Daniela Zheleva (@daniela-g-zheleva-db) from README.md as InnerSource SIG co-lead.

LICENCE.spdx Update

The following is the updated LICENCE.spdx content.

{
    "SPDXVersion": "SPDX-2.0",
    "DataLicense": "CC0-1.0",
    "Creator": "FINOS, The Fintech Open Source Foundation",
    "PackageName": "InnerSource Special Interest Group",
    "PackageOriginator": "FINOS, The Fintech Open Source Foundation",
    "PackageHomePage": "https://github.com/finos/innersource",
    "PackageLicenseDeclared": ["CC-BY-SA-4.0", "Apache-2.0"]
}

Note: The format of LICENCE.spdx was changed to non json as part of #39 (comment)

SPDXVersion: SPDX-2.2
DataLicense: CC0-1.0
Creator: FINOS, The Fintech Open Source Foundation
PackageName: InnerSource Special Interest Group
PackageOriginator: FINOS, The Fintech Open Source Foundation
PackageHomePage: https://github.com/finos/innersource
PackageLicenseDeclared: CC-BY-SA-4.0 AND Apache-2.0

@mcleo-d mcleo-d added the ready for review Item ready for review by the wider community label Oct 25, 2021
@mcleo-d mcleo-d requested a review from amaltson October 25, 2021 11:10
@mcleo-d mcleo-d self-assigned this Oct 25, 2021
@mcleo-d mcleo-d changed the title Apply CC-BY-SA 4.0 and APACHE 2.0 licenses to the FINOS InnerSource Special Interest Group InnerSource repository Apply CC-BY-SA 4.0 and APACHE 2.0 licenses to the FINOS InnerSource Special Interest Group InnerSource repository Oct 25, 2021
@mcleo-d mcleo-d changed the title Apply CC-BY-SA 4.0 and APACHE 2.0 licenses to the FINOS InnerSource Special Interest Group InnerSource repository Apply CC-BY-SA 4.0 license to the FINOS InnerSource Special Interest Group InnerSource repository Oct 25, 2021
Copy link
Contributor

@amaltson amaltson left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for getting this all worked out, very exciting!

LICENSE.spdx Outdated
"PackageOriginator": "FINOS, The Fintech Open Source Foundation",
"PackageHomePage": "https://github.com/finos/innersource",
"PackageLicenseDeclared": ["CC-BY-SA-4.0", "Apache-2.0"]
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing a new line here 😉

Copy link
Member Author

Choose a reason for hiding this comment

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

Resolved through cd00cc4 👍🏻

Copy link
Member Author

Choose a reason for hiding this comment

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

No longer required due to changes in #39 (comment)

LICENSE.spdx Outdated
PackageHomePage: https://github.com/finos/{project slug}
PackageLicenseDeclared: Apache-2.0
{
"SPDXVersion": "SPDX-2.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe the latest format is 2.2.. also, should the format be in JSON? I can't seem to find examples for this.

Copy link
Member Author

Choose a reason for hiding this comment

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

The following commits should resolve the feedback in this comment.

  • Updated "SPDXVersion": "SPDX-2.2", via 110ea80
  • Update format of LICENCE.spdx to remove json through 3772e47

Updated SPDX Format

SPDXVersion: SPDX-2.2
DataLicense: CC0-1.0
Creator: FINOS, The Fintech Open Source Foundation
PackageName: InnerSource Special Interest Group
PackageOriginator: FINOS, The Fintech Open Source Foundation
PackageHomePage: https://github.com/finos/innersource
PackageLicenseDeclared: CC-BY-SA-4.0 AND Apache-2.0

Copy link

@copiesofcopies copiesofcopies left a comment

Choose a reason for hiding this comment

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

Looks good! You could remove "distributed under" from the Apache language in the README, but it's not a big deal either way.

@mcleo-d
Copy link
Member Author

mcleo-d commented Oct 25, 2021

Looks good! You could remove "distributed under" from the Apache language in the README, but it's not a big deal either way.

Hi @copiesofcopies - Thank you for your feedback. I have revolved your comment here 8d832af

FINOS InnerSource SIG written materials are licensed under [CC-BY-SA-4.0](https://creativecommons.org/licenses/by-sa/4.0/). Software source code is licensed under [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0).

Copy link
Contributor

@amaltson amaltson left a comment

Choose a reason for hiding this comment

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

LGTM! The non-JSON format looks good and I do recall reading the AND for two license.

@mcleo-d
Copy link
Member Author

mcleo-d commented Oct 25, 2021

LGTM! The non-JSON format looks good and I do recall reading the AND for two license.

Feel free to merge @amaltson! 👏🏻 💯 💯 💯

@amaltson amaltson merged commit ff8c0ed into master Oct 25, 2021
@amaltson amaltson deleted the apply-cc-licence branch October 25, 2021 18:16
@vmbrasseur
Copy link

Probably should use the standard REUSE formatting for the licenses: https://reuse.software/tutorial/

@mcleo-d
Copy link
Member Author

mcleo-d commented Nov 8, 2021

Probably should use the standard REUSE formatting for the licenses: https://reuse.software/tutorial/

Hi @vmbrasseur - Thanks for the suggestion. It would be great if you could raise an issue so we can discuss with @amaltson and @copiesofcopies against the wider FINOS governance and boilerplates 👍🏻

James.

@godds
Copy link
Contributor

godds commented Nov 8, 2021

And worth adding an issue to aim to add the Reuse helper tool (https://reuse.software/tutorial/#step-3) as a GitHub action (if possible) to automatically check compliance on commits.

@mcleo-d
Copy link
Member Author

mcleo-d commented Nov 8, 2021

And worth adding an issue to aim to add the Reuse helper tool (https://reuse.software/tutorial/#step-3) as a GitHub action (if possible) to automatically check compliance on commits.

Hi @godds - Feel free to add this feature to the issue suggested to @vmbrasseur above 👍🏻

https://github.com/finos/InnerSource/issues/new?assignees=&labels=&template=Feature_request.md

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review Item ready for review by the wider community
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants