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

Add a pull request template with confirmation of submission terms #3431

Merged
merged 1 commit into from
Feb 9, 2022

Conversation

neilcsmith-net
Copy link
Member

@neilcsmith-net neilcsmith-net commented Jan 8, 2022

Add a pull request template with confirmation of submission terms and guidance.

Following on from @matthiasblaesing comments on easing the process for including code from new contributors, and making sure there's no need to get confirmation related to ASL section 5, could add it as text in the template. It shows up as plain text in the submission box, so (unlike Airflow) I've removed most of the markdown. Text could be shorter. Thoughts?

Will look similar to ...

Screenshot from 2022-01-08 18-35-03

Our contribution guidelines could do with a look, but that can happen next.

EDIT : Following comments and wording elsewhere, text updated from the image to be -


---
**^Add meaningful description above**

By opening a pull request you confirm that, unless explicitly stated otherwise, the changes -

 - are all your own work, and you have the right to contribute them.
 - are contributed solely under the terms and conditions of the Apache License 2.0 (see section 5 of the license for more information).

Please make sure (eg. `git log`) that all commits have a valid name and email address for you in the Author field.

If you're a first time contributor, see the Contributing guidelines for more information.

I'm not convinced we have to have this at all, but it's an option we have if we want to have that info more obvious. Shame no form templates like issues yet though!

@neilcsmith-net neilcsmith-net added the do not merge Don't merge this PR, it is not ready or just demonstration purposes. label Jan 8, 2022
---
**^Add meaningful description above**

By opening a pull request here, you confirm that the changes are all your own work, and provided to Apache NetBeans under the terms and conditions of the Apache License, without any additional terms or conditions (see also section 5 of the license).
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be Apache License Version 2.0 and IMHO the more important part is, something along the lines:

You acknowledge, that you donates the change to the ASF, which means, that the ASF can relicense and sublicense the work.

This would become important, if at anytime the ASF decides to release the Apache License 2.1 or 3.0. I don't know the ration, but I assume, that 99% of the repository is ASF-2.0-ASL (with donation clause).

Copy link
Contributor

Choose a reason for hiding this comment

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

Searching for the right legal wording, the ICLA itself looks fitting:

  1. You grant to the Apache Software Foundation (Foundation) and to recipients of software distributed by the Foundation a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
  2. You grant to the Foundation and to recipients of software distributed by the Foundation a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
  3. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to the Foundation, or that your employer has executed a separate Corporate CLA with the Foundation.
  4. You represent that each of Your Contributions is Your original creation. You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.

Copy link
Member Author

Choose a reason for hiding this comment

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

@matthiasblaesing ASF don't require anything from a legal perspective! Just opening a PR is enough. That's why section 5 is in the license. You cannot work with the sources at all without accepting the licence, and therefore have already accepted the terms of contribution.

This is about better information if we have it at all. The wording should be from or refer to that license section, nothing more, or we actually muddy the waters.

Agree should be Apache License 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'm not a lawyer and ask myself why on earth I had to get an ICLA on file, but ok, I made my point, so fine with me.

Copy link
Member Author

Choose a reason for hiding this comment

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

@matthiasblaesing committers need an ICLA, contributors don't. In general at least - we may ask for one if it's a large contribution, unsure of provenance, etc.

Although this is not official, it links to some useful stuff on ASF side and has been discussed here https://apetro.ghost.io/apache-contributors-no-cla/

Copy link
Member Author

Choose a reason for hiding this comment

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

I've pushed an update. Have removed reference to NetBeans or ASF explicitly though to try and keep the length down. This is meant to be info rather than legal (which is covered by section 5 ASL or CLA), so think it's obvious enough.

Also added line about author info.

I'm not convinced we have to have this at all, but it's an option we have if we want to have that info more obvious. Shame no form templates like issues yet though!

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool!

Since this is an .md (markdown) file, maybe we want to add a link to the contribution guidelines https://netbeans.apache.org/participate/index.html ? Maybe a link to the dev mailing https://netbeans.apache.org/community/mailing-lists.html ?

The idea is to let people know how to do things without having to Google how first :-)

Copy link
Contributor

Choose a reason for hiding this comment

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

D'oh. I'm confused myself. We have at least two different contribution guidelines. Here's another one https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=74681408

Copy link
Member Author

Choose a reason for hiding this comment

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

@vieiro while it's a markdown file (as copied and adapted from Airflow) it's not like the new issue templates in #3415 where we can have actual markup displayed. See the image, it's plain text. I tried links like Airflow has in theirs, but decided it looks far better and easier to read without.

There is a direct link to the contributing guidelines file already under the text input, and various other places in the UI. This links to .github/CONTRIBUTING.md, which we could improve in place as well as link off. And as mentioned above move up next to README so it's not hidden in a checkout / not specific to GitHub.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok with me then. Full speed ahead!

@neilcsmith-net neilcsmith-net removed the do not merge Don't merge this PR, it is not ready or just demonstration purposes. label Jan 10, 2022
@vieiro
Copy link
Contributor

vieiro commented Jan 10, 2022

D'oh, I think a pressed the wrong button and resolved the conversation. Don't know what that is expected to mean. Something is on fire now, I think. My sincere apologies.

@neilcsmith-net
Copy link
Member Author

Got waylaid by release stuff. Let's merge this - see if it helps, and easy revert if it causes problems!

@neilcsmith-net neilcsmith-net merged commit 8bbbdcc into apache:master Feb 9, 2022
@neilcsmith-net neilcsmith-net deleted the gh-pr-notice branch January 16, 2024 09:45
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

3 participants