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

Bsd clause3 fixup #106

Merged
merged 2 commits into from
Aug 22, 2018
Merged

Bsd clause3 fixup #106

merged 2 commits into from
Aug 22, 2018

Conversation

mikaelarguedas
Copy link
Contributor

As discussed offline, we need to relax the matching of the 3rd clause of the BSD 2 license to make porting easier.
This PR removes the requirement for the the preceding the copyright holder.

The second commit is cosmetic and replace the {company} placeholder with {copyright_holder} as the copyright holder doesn't have to be a company

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@mikaelarguedas mikaelarguedas self-assigned this Aug 21, 2018
@mikaelarguedas mikaelarguedas added in progress Actively being worked on (Kanban column) in review Waiting for review (Kanban column) and removed in progress Actively being worked on (Kanban column) labels Aug 21, 2018
@dirk-thomas
Copy link
Contributor

Maybe using a "generic" license text as in https://opensource.org/licenses/BSD-3-Clause should be considered for the template. It also insulates the expansion of the copyright holder in the leading lines to affect the license text below.

@mikaelarguedas
Copy link
Contributor Author

Yes that was my original proposal. The reason it was not implemented is because the ported ROS 1 code shouldn't have to change the content of the license and currently all ROS 1 code lists Willow Garage Inc. in the third clause instead of the generic "copyright holder" term.

That is why we decided to accept basically anything between Neither the name of and nor the names of its to account for all the code out there that is expanding the copyright holder in the 3rd clause

@dirk-thomas
Copy link
Contributor

Yes that was my original proposal.

I would second that.

The reason it was not implemented is because the ported ROS 1 code shouldn't have to change the content of the license

I am not sure that is a strict requirement. If slightly modified licence blocks need to be "unified" during the process that would be acceptable (even preferable) to me. (I would prefer a strict comparison over the "alow anything in between - I could simply write a very different license block which would still be classifies as BSD...)

@dirk-thomas
Copy link
Contributor

[I am not objecting to merge this change - I just don't think we have to make the template as flexible as possible to allow "anything" similar to pass. At the end the developer opt-in to use the copyright linter.]

@mikaelarguedas
Copy link
Contributor Author

Opened #107 to track alternatives. Merging this

@mikaelarguedas mikaelarguedas merged commit c30c0c6 into master Aug 22, 2018
@mikaelarguedas mikaelarguedas deleted the bsd_clause3_fixup branch August 22, 2018 01:03
@mikaelarguedas mikaelarguedas removed the in review Waiting for review (Kanban column) label Aug 22, 2018
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.

None yet

2 participants