#287 - Update contributing guide for CLA tooling.

Update links to CLA form. Adopt guide to sign CLA.
This commit is contained in:
Mark Paluch
2016-07-27 09:33:52 +02:00
parent 24db8b32c7
commit 43a0ebb23b
2 changed files with 8 additions and 3 deletions

View File

@@ -1,9 +1,13 @@
<!--
Thank you for proposing a pull request. This template will guide you through the essential steps necessary for a pull request.
Make sure that:
-->
- [ ] You have read the [Spring Data contribution guidelines](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc).
- [ ] There is a ticket in [Github issues](https://github.com/spring-projects/spring-data-build/issues).
- [ ] You use the code formatters provided [here](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide) and have them applied to your changes. Dont submit any formatting related changes.
- [ ] You submit test cases (unit or integration tests) that back your changes.
- [ ] You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).
- [ ] You provide your full name and an email address registered with your GitHub account. If youre a first-time submitter, make sure you have completed the [Contributors License Agreement form](https://support.springsource.com/spring_committer_signup).

View File

@@ -41,7 +41,8 @@ Additional explanations if necessary.
See also: DATA…-???. (optionally refer to related tickets)
----
* Make sure you provide your full name and an email address registered with your GitHub account. If you're a first-time submitter, make sure you have completed the https://support.springsource.com/spring_committer_signup[Contributor's License Agreement form].
* Make sure you provide your full name and an email address registered with your GitHub account.
If you're a first-time submitter, make sure you have signed the https://cla.pivotal.io/sign/spring[Contributor License Agreement].
[[advanced]]
== Advanced
@@ -77,7 +78,7 @@ This section contains some stuff that the IDE formatters do not enforce. Try to
=== Handling pull requests
* Be polite. It might be the first time someone contributes to an OpenSource project so we should forgive violations to the contribution guidelines. Use some gut feeling to find out in how far it makes sense to ask the reporter to fix stuff or just go ahead and add a polishing commit yourself.
* The information we need from contributors are: their full name, an email address they have associated with their Github account, the confirmation number of the CLA (for the first contribution). Especially the first one probably needs to be asked for as people sometimes just use some alias in their GitHub account.
* Before we accept a non-trivial patch or pull request we will need you to https://cla.pivotal.io/sign/spring[sign the Contributor License Agreement]. Signing the contributors agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. If you forget to do so, you'll be reminded when you submit a pull request.
* If you decide to merge stuff back make sure that all the infrastructure requirements are met (set up a JIRA ticket to commit against if necessary, etc.).
* Before merging stuff back into master, make sure you rebase the branch. We generally do not allow merge commits, so a merge should always be fast-forward. The ticket IDs and the timestamps give enough tracking information already.
* The simplest way to merge back a pull request submitted by someone external is `curl`ing the patch into `git am`. You can then polish it by either adding a commit or amending the provided commit. Make sure you keep the original author when amending.