Correct copyright notices to reflect Copyright OpenSearch Contributors #712
Conversation
|
✅ DCO Check Passed 9ead91a |
|
Did we need to do something like this #350 as well ? |
|
I'm fixing the NOTICE generator and sending out a revision. |
|
✅ DCO Check Passed cae70ae |
NOTICE.txt
Outdated
| OpenSearch | ||
| Copyright 2021 OpenSearch Contributors | ||
| This product includes software, including Kibana source code, developed by Elasticsearch (http://www.elastic.co). | ||
| Copyright 2012-2021 Elasticsearch B.V. |
There was a problem hiding this comment.
Was this in the original Kibana license? I think we should then reproduce it as is.
There was a problem hiding this comment.
Part of this was, yes. Do we need to include their NOTICE header? https://github.com/elastic/kibana/blob/v7.10.2/NOTICE.txt
There was a problem hiding this comment.
I am not 100% sure, let's ask @hyandell?
There was a problem hiding this comment.
We need to include the relevant NOTICE text for any Apache-2.0 with a NOTICE content that we bring in. Make sure it's the NOTICE text at that time; i.e. don't include that project's NOTICE 2 years later on just because it's the latest on their main branch.
The only proviso is if we have removed the content it refers to.
In the case of this NOTICE file PR in general, my concerns are:
- Removing our copyright year: Not hugely concerned. We don't usually put copyright years on our OSS, but we included it in this case to avoid it seeming odd when the original codebase did use years.
- Changing the top "This product includes" language. I'm not seeing a great need to do this.
- Changing Elastic's copyright date. This is concerning and should only be done if you're identifying that nothing post 2018 was included in the repository.
- Adding the line about Joda. Is this true for this project, or is this being copied from another project?
- Removing other items in the NOTICE. This should only be done if you've conducted a review to confirm they're no longer there. I think we should do that one GitHub issue a time, with a PR for each, so that we are properly tracking the review we've done to confirm that that notice-element no longer, or never did, apply.
There was a problem hiding this comment.
We cleared the whole removing year for our copyright and the language earlier.
There was a problem hiding this comment.
Thanks Henri for the clarifications. I'm deferring the NOTICE changes for now since they're not required and I've opened #765 to address discrepancies that exist between the current NOTICE file and the generator script.
NOTICE.txt
Outdated
| @@ -145,70 +150,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |||
| SOFTWARE. | |||
|
|
|||
| --- | |||
There was a problem hiding this comment.
Are these part of the codebase. Do not remove notices if they are.
There was a problem hiding this comment.
This is auto-generated, so I believe they have been removed from the codebase.
NOTICE.txt
Outdated
| @@ -115,10 +124,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |||
| THE SOFTWARE. | |||
|
|
|||
| --- | |||
There was a problem hiding this comment.
Are these still part of the codebase. Do not remove notices if they are.
Resolves opensearch-project#711 Signed-off-by: Tommy Markley <[email protected]>
|
I've removed the changes to the NOTICE file so that we can discuss them in a different thread. It's clear to me that there's a discrepancy between the current NOTICE file in the repo and the generated NOTICE file, so I've documented that here: #765 This PR now just includes the required change in the README. |
|
✅ DCO Check Passed cf10116 |
Resolves opensearch-project#711 Signed-off-by: Tommy Markley <[email protected]>
Resolves #711 Signed-off-by: Tommy Markley <[email protected]>
Description
Removed Amazon copyright, the correct copyright for OpenSearch projects is "Copyright OpenSearch Contributors".
Signed-off-by: Tommy Markley [email protected]
Issues Resolved
Resolves #711
Check List