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

Normalize the licensing scheme #737

Merged
merged 5 commits into from Apr 19, 2017
Merged

Conversation

@timperrett
Copy link
Contributor

@timperrett timperrett commented Apr 11, 2017

Typically speaking, if you have work you depend on, or other inspiration you took and made a derivative work then those licenses should be included in the NOTICE file... However, the biggest problem with all OSS is that not much has been tested in court. As it stands Envoy does not include a proper license, so doing so seems prudent in the least (notice how Github was unable to parse the license for auto license detection).

DISCLAIMER: I'm not a lawyer :-)

NOTICE Outdated
@@ -0,0 +1,4 @@
Envoy
Copyright (c) 2017 Lyft Inc. All rights reserved.

This comment has been minimized.

@mattklein123

mattklein123 Apr 11, 2017
Member

2016-2017?

NOTICE Outdated
Envoy
Copyright (c) 2017 Lyft Inc. All rights reserved.

Licensed under Apache License 2.0. See LICENSE.txt for terms.

This comment has been minimized.

@mattklein123

mattklein123 Apr 11, 2017
Member

s/LICENSE.txt/LICENSE

@mattklein123
Copy link
Member

@mattklein123 mattklein123 commented Apr 11, 2017

@ryan-lane can you take a look at this?

timperrett added 2 commits Apr 11, 2017
NOTICE Outdated

Licensed under Apache License 2.0. See LICENSE for terms.

Zipkin (Apache V2)

This comment has been minimized.

@PiotrSikora

PiotrSikora Apr 12, 2017
Member

None of the libraries listed here are part of this repository, so this doesn't belong here.

This comment has been minimized.

@timperrett

timperrett Apr 12, 2017
Author Contributor

Yeah you're probably right, given those items are not included in the source itself. Might be worth have a note about other software that's included, for explicitness - it could just go in the README or something.

LICENSE Outdated
@@ -1,15 +1,202 @@
Envoy
Apache License

This comment has been minimized.

@PiotrSikora

PiotrSikora Apr 12, 2017
Member

Nit: first line is empty in the original Apache license file.

same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner].

This comment has been minimized.

@PiotrSikora

PiotrSikora Apr 12, 2017
Member

This should be filled out, i.e.

Copyright 2016-2017, Lyft Inc.

and then you could drop NOTICE file, which isn't really used outside of Apache's own projects.

This comment has been minimized.

@timperrett

timperrett Apr 19, 2017
Author Contributor

@PiotrSikora actually no, I dont think this is accurate. The license needs to be the license verbatim, not with adjustments. Given this is Lyft's project, defer to @ryan-lane for call on it. Our legal beavers have us include it verbatim and use the notice file, as directed by apache licensing.

This comment has been minimized.

@PiotrSikora

PiotrSikora Apr 19, 2017
Member

You're right. I always thought you had to include it verbatim, like you said, but when I was double checking it with Apache projects last week, I thought they had changed it... Of course, now I cannot find this, so please ignore my previous comment.

@PiotrSikora
Copy link
Member

@PiotrSikora PiotrSikora commented Apr 12, 2017

Also, while we're on the topic, in theory all files should contain the copyright notice, i.e.

// Copyright 2016-2017, Lyft Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//       http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

in their headers.

LICENSE Outdated
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

This comment has been minimized.

@PiotrSikora

PiotrSikora Apr 12, 2017
Member

Nit: remove empty last line.

@mattklein123
Copy link
Member

@mattklein123 mattklein123 commented Apr 12, 2017

@PiotrSikora yeah re: file headers. Sigh. I will open a GH issue to automate this somehow. We need a script that will add the headers and also add checking to check_format that the header exists.

NOTICE Outdated
@@ -0,0 +1,4 @@
Envoy
Copyright (c) 2016-2017 Lyft Inc. All rights reserved.

This comment has been minimized.

@ryan-lane

ryan-lane Apr 12, 2017

I'm not sure this should have All rights reserved.

This comment has been minimized.

@mattklein123
Copy link
Member

@mattklein123 mattklein123 commented Apr 18, 2017

@timperrett we are OK to merge this pending the small nits above. Can you fix? If not LMK and I can close and open a new PR.

@timperrett
Copy link
Contributor Author

@timperrett timperrett commented Apr 19, 2017

And right, headers will be required but that would need automating as you've pointed out @mattklein123 :-) Hope this helps.

@mattklein123
Copy link
Member

@mattklein123 mattklein123 commented Apr 19, 2017

Thanks @timperrett for your legal acumen 😉

@mattklein123 mattklein123 merged commit e21043d into envoyproxy:master Apr 19, 2017
1 check was pending
1 check was pending
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
Envoy
Copyright 2016-2017 Lyft Inc.

Licensed under Apache License 2.0. See LICENSE for terms.

This comment has been minimized.

@PiotrSikora

PiotrSikora Apr 19, 2017
Member

Is the last line really needed?

rshriram pushed a commit to rshriram/envoy that referenced this pull request Oct 30, 2018
Automatic merge from submit-queue.

[DO NOT MERGE] Auto PR to update dependencies of proxy

This PR will be merged automatically once checks are successful.
```release-note
none
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.